From 0f258eb28a6dbbecd4bd2be25211e3a0564df18f Mon Sep 17 00:00:00 2001 From: lsm Date: Thu, 11 Jul 2024 09:11:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=88=86?= =?UTF-8?q?=E7=BB=84=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs b/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs index 1bb2a70..0efb9f3 100644 --- a/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs +++ b/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs @@ -40,7 +40,10 @@ namespace PEIS.Model.Enrollment public void UpdateGroup(EnrollmentOrgGroup item) { var list = DAOHelp.GetDataBySQL($"SELECT a.*, b.Name,b.Birthday,b.CardType, b.CardNo,b.Education, b.Marriage,b.Nation, b.Tel1, b.Tel2, CASE b.Sex WHEN 1 THEN '男' WHEN 2 THEN '女' ELSE '' END AS Sex FROM Enrollment_OrgPatient a LEFT JOIN Base_Patient b ON a.PID = b.ID WHERE GroupID = {item.ID} AND OID = {item.OID}"); - if (list.Count != 0) return; + if (list.Count != 0){ + Global.Msg("info", "当前分组已存在人员！"); + return; + } DAOHelp.ExecuteSql($"UPDATE ENROLLMENT_ORGGROUP SET Name= '{item.Name}', Description= '{item.Description}', Sex= '{item.Sex}', Marriage= '{item.Marriage}', AgeMin= {item.AgeMin}, AgeMax= {item.AgeMax}, Type= '{item.Type}' WHERE ID= {item.ID}", false); } From 9b964ca707e64dddffbde8aaecf4dc8813a50ecb Mon Sep 17 00:00:00 2001 From: HI <15012290903@163.com> Date: Thu, 11 Jul 2024 11:47:00 +0800 Subject: [PATCH 2/6] =?UTF-8?q?+=E6=80=BB=E6=A3=80=E7=BB=93=E8=AE=BA?= =?UTF-8?q?=E8=AF=8D=E6=89=8B=E5=8A=A8=E6=8E=92=E5=BA=8F=E3=80=81=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=BB=93=E8=AE=BA=E8=AF=8D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Properties/Resources.Designer.cs | 20 ++ PEIS/Properties/Resources.resx | 30 +- PEIS/Resources/shang.png | Bin 0 -> 2348 bytes PEIS/Resources/xia.png | Bin 0 -> 2360 bytes PEIS/View/Exam/TotalForm.Designer.cs | 481 +++++++++++--------------- PEIS/View/Exam/TotalForm.cs | 119 +++++-- PEIS/View/Exam/TotalForm.resx | 26 +- 7 files changed, 359 insertions(+), 317 deletions(-) create mode 100644 PEIS/Resources/shang.png create mode 100644 PEIS/Resources/xia.png diff --git a/PEIS/Properties/Resources.Designer.cs b/PEIS/Properties/Resources.Designer.cs index a86da42..797f1ab 100644 --- a/PEIS/Properties/Resources.Designer.cs +++ b/PEIS/Properties/Resources.Designer.cs @@ -140,6 +140,16 @@ namespace PEIS.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap shang { + get { + object obj = ResourceManager.GetObject("shang", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -170,6 +180,16 @@ namespace PEIS.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap xia { + get { + object obj = ResourceManager.GetObject("xia", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/PEIS/Properties/Resources.resx b/PEIS/Properties/Resources.resx index 5bebda9..6bd5584 100644 --- a/PEIS/Properties/Resources.resx +++ b/PEIS/Properties/Resources.resx @@ -130,6 +130,9 @@ ..\Resources\审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\menu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -157,9 +160,6 @@ ..\Resources\Report.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\预览报告.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\查找.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -172,6 +172,9 @@ ..\Resources\刷新.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\个人信息 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\添加.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -184,6 +187,9 @@ ..\Resources\结论.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\wechatlogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\添加1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -199,25 +205,25 @@ ..\Resources\WeChat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\取消审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\取消.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\分检页面.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\取消审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\总检页面.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\个人信息 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\预览报告.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\wechatlogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\shang.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\xia.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/PEIS/Resources/shang.png b/PEIS/Resources/shang.png new file mode 100644 index 0000000000000000000000000000000000000000..1c9abf23eee9dde21f271735b48864de3b0de4a0 GIT binary patch literal 2348 zcmeHISy)r&77YO-C}>3+Yz9E)!9o#{IfN1ks02j4A0PrMlQJ1mfk26IDp*M%0u_VQ z8Y0w-Kmvl1K)?YZDbk2jf{m0gUgXA}5WHLUR&W*T}hNC^xJgu%Fswc5k0 zpdLDu5V+qf{OHeViys&?8f`<-PkPJejkVMhyOVlYli$1ISM|fKm=6&1xY>=H@rYf{ zvNu6b`Vp4y_++<0aKAp`3&S~j*R@vK7VC}fJ7Q>IXU=oEJL{vw|*? z;R3|DSY$=c0^HYL2t)g>r{YH+D0ogJVk~|w&zs!ygG(TKFTzkHF4x_c(3#C_RZUr!~=bq78%ixq5pM=JJ?m z!-o+rad5vj$^2}xS zPMi4K5TZfy0OIu@fp~q_bDv18m@G$6l4aTmmiS!=PDh-M-VYJMa)|hxJ>?Zc0NloV zjcV;#rVwKJ7BpinVQ3VZ;Q^Hitv^AEF5n-gQ!sabBO}tH^ZsMw8Br&bN z%mI1>HX{vlcT2DiajJQi+2>s@&z?XJXf1Yt;1pPipEtx~$`6Xq+LDuP~d%H>tdt?K}iFqQq0ieh5LVc4#vJvl{w=2yNjHb@o8mU8m;S6uJ1w|k`dzt9MeB~h;@2mmzUyh-h2a>VEY$8Ua0 z3}N`7%!;cW=$9-c<-PTR`o?1)i=O`zxW5la;l*M~PG=P^eWWnPc-kOQzF5!|#(wYL zhd0Mn-H0N+t9V+o)q?owsOlbp38;pMiqJfnlSux^cx(YU0Jf%eP9ceGtvVZQWxBAM zwlI%@Gw+;#Xur(UjKKN0>n~Rh)iX{r*uU{X^~|g*6UcaVe`coS_IrN;p0YRq9w%=X zcq-kQKu&9y3zazYwylV#`2gqpAl2AJwHImwD_)rCZz>P;iBg+6%N{ADt%A9ZHq$TZ z!7nB#HlTW1lKZ;t3QzNuJ~;TE%b8OGZ_3Px)+e(anblOEC9?L7u4}1(jBX?39&0;Q zSHQ0=98D!;$py=eWj11A-EiCR(-{qgC%q&m`!iEKcWgzpoW*}Wy{WwlFyPtFhw=F+9Zlx;28`=;? z-4k8qoklh=)?y^I0buF>-YsR};mv&4znlL@i%^i`=ghA29p}35P?8{nGy3o$_e|XF z6_Jm)DV)*UafzgJ6xdaTG%<5JI`6&R_+%ZU_bPB<-JkW8mK)mM+lPb$C{BU$lf4sk zQ?})8>j)T}-kBFG>H{?PM8#F0h^}MccN3Ya@VWrH1^OR4yEAYu!~ERh?;_k3FSQ4n z*oh2r`+>p9pG9`_f~~m8i1}jy5|6ti$S6pgG!+f4$>4DXq+GzwZPLM|Lf%=TZw! zeBL)UogN^(r)mr^HLjPuRQfY#Jp&3yol1i@_G|Cns92#4p6w9{OPJUlfCy`TDp4KpyYslm0Mf5-CvLHKLBkxamD}u literal 0 HcmV?d00001 diff --git a/PEIS/Resources/xia.png b/PEIS/Resources/xia.png new file mode 100644 index 0000000000000000000000000000000000000000..087b6f70c30f2de68116f47666ff0bf895167d29 GIT binary patch literal 2360 zcmeH|=~okH6o*4F0T(L71s8TGiWQI+NeD<17L!1UMp>lnilPW&1OW+x5iBYs5lFzA zxEujfSzIEh)d00XB0^jeDFqcUfGi3aDFhOd>5To-p8f+pJ^k>`z3+X0=iWPaW}Z2- zokBEPv}O?u1~Vd)e0P9$IkXIs;FWpC+z2#!DLaVXup3X!M#0U3ctRin2D{B(JRgey z&&gk1LTa?__9@ar2khv zzxlMbA+5f_?{gu{WiV>f={Q55pEC5Q$g}VU{a>~_Md3M&iW5|Q2Lp@|C#3Ff+(7?u z{*kvZJ9~%Z8+t>#VSFS~aLC=5FC2n#78_W(TzQ?n-c-Ne^>Fii3_Uy6uk|s%dAQqs z7J*;Y@@^St=PsAlHvOt4pyH$QP42pTj?5`zF5EuBPL#%CH}g!(oV~fRU{)QVQUT>2 z8cO1M%ecAs!)0t-Q_lRY#Nt}LTgHzLtTOC(HAdo{BGD2_(Yf}R6IU2kWsRAcZ#}Kc z9>ECuWJHj2383WFH5cIy&)RPfwG z!y!+?RWM0S+f;M<%_C3BGx*gy+gaPG{x%RCM=(|?|SA6_F`)k^T@!0-79gm zYdVfh+gtGNf7sH&mN=`+l!f1O)~++Yqb(oB42>Q0bdv?lwa#9_v52k}VD9s+y~zq5 zAz>qsn)SRdaQ{ZPXG-Y~!poAq6_j!l8n_9Wx>rodhPH~*OtOg%La0_^l> z)nUC%leC@w9?A65*T%PCFNo=r$GIsM;{56NUpJOa&BhBP203ak zuinfj?=Bj}{r+t9@J!0IkLMRMa~n>{*wQbjf%0vn zQ|8i7(c);;I;E(dBlTEK(nd?eZah`cOiFs2=PPPSZn2YCR=1{Fg)8i8$P5+%E3({< zQr#vatk4pry+yjB{>NW!!c@KJNnoQzzVf@5dqsdGNdz3-4rw$wm$TR6($(OLf1#zw zlgf^}NOxW>spmI&=)!?lb*DJeho+C;4)JF9oh!8^qWW@J$)#66IJVNpZ5jcIa{O1Y zRFD;#_%)MwYIz%Wrtw%`yb@E`B`ekHx&pgJ;S5)eBI{D6Ep75mh*^D-c6THcjIb>b4?Optndd6)@sGlx%jO6qyd!>lY%q*$RN zit6gow2hQ*KK>BRS0?Ulc~K~IXUvPMY^f@H);o@L;o!26)nqf3>!mUjkd4!6?_}7q zkRWi*dDLtu&M+FNuOW-RS0)6G(q2MQ_mJgn;t_AN%^>myEh@LlxR?YGmXG271r-5* zN)TKWxl8dQ1UREax?N;p`8AMJu64CVshe3BK*|a8k_sx?{}g|j6kr$0{;V)`+k#Tu zhqR~NHlq}?r$DLfWMDxaCOhya8vH=pHD7PDCJ4%P``;89O9W5_$M8_Q78)7?Fyb{B z%z~OZd*8;IrGbvWsv9Gn-sAE)Si1qG*u{q^`#jAK90cUaLO}0xtYWLTSv&O*AKy{R z%)^vIWoig=(rKS^$Rqm-c`4Y7Ds*I|R!VUgXD(F>l-8vXfNNfKTH31nT+gCr6!{9O zdVN!%`^DdN=f%^Op=$sb9BR#{C7wg@KVXdGVz=$*f`v~ipzhXR`ggic2snp@KjCh; z;C${sOx19{eEr}=Q}x=Bswy3QOvSz?a0rbSOJIkpKe0PU_CG+kcfOxB{@Jl%1MZ=^ zAxM)iCl7w|^Mv0o&cS+(OhzG4m;I3Lf`!oqFy-~Dx}I|XW{_E}!B+Ly;xLLpiOVsu zgqw2#d9_TAWi9tYej?-v(E+0exN@h<)aQul_`- + { + ConclusionSort(-1); + }; + OpsConclusion.TsmiAdd.Click += (s, e) => + { + ConclusionSort(1); + }; //结论-删除 OpsConclusion.TsmiDelete.Click += ConclusionDelete_Click; //结论-保存 @@ -212,22 +224,59 @@ namespace PEIS.View.Exam { SearchAllConclusion(); }; - DgvExamConclusion.OptionsCustomization.AllowSort = true; + DgvExamConclusion.OptionsCustomization.AllowSort = true; //DgcAllConclusion.DataSource = Global._lstConclusion; // DgvAllConclusion.OptionsFind.AlwaysVisible = true; // DgvAllConclusion.OptionsFind.ShowClearButton = false; // DgvAllConclusion.OptionsFind.ShowCloseButton = false; DgvAllConclusion.DoubleClick += DgvAllConclusion_DoubleClick; DgvExamResultData.CustomDrawCell += DgvExamResultData_CustomDrawCell; + + // 启用行选择 + DgvExamConclusion.OptionsSelection.EnableAppearanceFocusedCell = false; + DgvExamConclusion.OptionsSelection.MultiSelect = false; // 限制单选 + // 启用编辑功能，以便显示勾选框 + DgvExamConclusion.OptionsBehavior.Editable = true; + // 设置行头自动调整高度以显示勾选框 + DgvExamConclusion.OptionsView.RowAutoHeight = true; } + private void ConclusionSort(int i) + { + if (DgvExamConclusion.GetFocusedRow() is ExamConclusion selected) + { + var current = _examConclusion.IndexOf(selected); + if ((current == 0 && i < 0) || (current == _examConclusion.Count - 1 && i > 0)) + { + return; + } + + var temp = _examConclusion[current + i]; + var tempSeq = _examConclusion[current + i].Seq; + temp.Seq = selected.Seq; + selected.Seq = tempSeq; + _examConclusion[current + i] = selected; + _examConclusion[current] = temp; + _examConclusion = _examConclusion.OrderBy(o => o.Seq).ToList(); + // for (int j = 0; j < _examConclusion.Count; j++) + // { + // _examConclusion[j].Seq = j + 1; + // } + Invoke(new Action(() => DgcExamConclusion.DataSource = null)); + Invoke(new Action(() => DgcExamConclusion.DataSource = _examConclusion)); + Invoke(new Action(() => DgcExamConclusion.DataSource = _examConclusion)); + Invoke(new Action(() => DgvExamConclusion.FocusedRowHandle = current+i)); + Invoke(new Action(() => DgvExamConclusion.SelectRow(current + i))); + + } + } private void SearchAllConclusion() { var query = txtConclusionSerch.Text; var isId = long.TryParse(query, out var id); - var list=string.IsNullOrEmpty(query) - ? Global._lstConclusion - : Global._lstConclusion.Where(p => p.SpellCode.Contains(query) || p.ConclusionName.Contains(query) || (isId && p.ID == id)).ToList(); + var list = string.IsNullOrEmpty(query) + ? Global._lstConclusion + : Global._lstConclusion.Where(p => p.SpellCode.Contains(query) || p.ConclusionName.Contains(query) || (isId && p.ID == id)).ToList(); Invoke(new Action(() => DgcAllConclusion.DataSource = null)); Invoke(new Action(() => DgcAllConclusion.DataSource = list)); @@ -337,12 +386,12 @@ namespace PEIS.View.Exam if (rowData != null) { - var conclusion = DgvExamConclusion.GetFocusedRow() as ExamConclusion; - if (rowData == null || conclusion == null) return; - var index = _examConclusion.IndexOf(conclusion); - _examConclusion[index].Conclusion = rowData.ConclusionName; - _examConclusion[index].Suggestion = rowData.Suggestion; - ShowExamConclusion(_examConclusion); + var conclusion = DgvExamConclusion.GetFocusedRow() as ExamConclusion; + if (rowData == null || conclusion == null) return; + var index = _examConclusion.IndexOf(conclusion); + _examConclusion[index].Conclusion = rowData.ConclusionName; + _examConclusion[index].Suggestion = rowData.Suggestion; + ShowExamConclusion(_examConclusion); } } } @@ -472,9 +521,9 @@ namespace PEIS.View.Exam /// /// 3. 获取科室小结 /// - public event EventHandler> GetSummary; + public event EventHandler> GetSummary; + - public void ShowSummary(List items) { Invoke(new Action(() => _examPart = items)); @@ -504,6 +553,11 @@ namespace PEIS.View.Exam public void ShowExamConclusion(List items) { + items = items.OrderBy(o => o.Seq).ToList(); + for (int j = 0; j < items.Count; j++) + { + items[j].Seq = j + 1; + } Invoke(new Action(() => DgcExamConclusion.DataSource = null)); Invoke(new Action(() => _examConclusion = items)); Invoke(new Action(() => DgcExamConclusion.DataSource = _examConclusion)); @@ -537,8 +591,8 @@ namespace PEIS.View.Exam { GetPatient?.Invoke(this, new Args(selected.ID)); GetExamResultList?.Invoke(this, new Args(_patient.ID)); - GetSummary?.Invoke(this, new Args(_patient.ID)); - Invoke(new Action(() =>GetExamResultData(_patient.ID))); + GetSummary?.Invoke(this, new Args(_patient.ID)); + Invoke(new Action(() => GetExamResultData(_patient.ID))); GetExamConclusion?.Invoke(this, new Args(_patient.ID)); } else @@ -707,7 +761,7 @@ namespace PEIS.View.Exam return; } - _examConclusion.Add(new ExamConclusion() { EID = _patient.ID,Seq = _examConclusion.Count+1 }); + _examConclusion.Add(new ExamConclusion() { EID = _patient.ID, Seq = _examConclusion.Count + 1 }); ShowExamConclusion(_examConclusion); } @@ -731,8 +785,27 @@ namespace PEIS.View.Exam if (DgvExamConclusion.GetSelectedRows().Length == 0) return; var item = DgvExamConclusion.GetRow(DgvExamConclusion.FocusedRowHandle) as ExamConclusion; + if (item==null)return; + if (!Global.MsgDelete()) return; + _examConclusion.Remove(item); ShowExamConclusion(_examConclusion); + + try + { + var task = new Task(() => item?.Delete()); + task.Start(); + } + catch (AggregateException ae) + { + Global.MsgErr($@"{item.Conclusion} 结论词删除失败！" + ae.Message); + ae.Handle(ex => + { + // 处理异常 + return true; // 返回true表示已处理异常 + }); + } + } /// @@ -759,7 +832,7 @@ namespace PEIS.View.Exam SaveExamConclusion?.Invoke(this, new Args() { ID = _patient.ID, - Items = _examConclusion.Where(p=>!string.IsNullOrEmpty(p.Conclusion)).ToList() + Items = _examConclusion.Where(p => !string.IsNullOrEmpty(p.Conclusion)).ToList() }); //MessageBox.Show(@"保存成功！"); } @@ -970,7 +1043,7 @@ namespace PEIS.View.Exam var imageBytes = Convert.FromBase64String(patient.Photo); using (var ms = new MemoryStream(imageBytes, 0, imageBytes.Length)) { - Invoke(new Action(() => { picAvatar.Image = Image.FromStream(ms, true); })); + Invoke(new Action(() => { picAvatar.Image = Image.FromStream(ms, true); })); Invoke(new Action(() => { picAvatar.BorderStyle = BorderStyle.None; })); } } @@ -995,7 +1068,7 @@ namespace PEIS.View.Exam /// public void GetExamResultData(long eid) { - if (eid==0) + if (eid == 0) { return; } @@ -1020,7 +1093,7 @@ namespace PEIS.View.Exam Invoke(new Action(() => DgvExamResultData.ExpandAllGroups())); DgvExamResultData.OptionsView.RowAutoHeight = true; } - + private void DgvExamResultData_CustomDrawCell(object sender, RowCellCustomDrawEventArgs e) { var gridView = (GridView)sender; diff --git a/PEIS/View/Exam/TotalForm.resx b/PEIS/View/Exam/TotalForm.resx index d8c7d4a..7155ed1 100644 --- a/PEIS/View/Exam/TotalForm.resx +++ b/PEIS/View/Exam/TotalForm.resx @@ -120,6 +120,12 @@ 497, 55 + + 497, 55 + + + 377, 55 + 377, 55 @@ -139,18 +145,14 @@ - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAlJJREFUWEfV - lrFP20AUxpNCiIoEAuEwVEBM24WhCimIZKjoWrNARQQjf0K7tWuBuaqABXVpJ5hYSar+A8xBXRmRGFqE - QGoloLx3/i44vjv7HFOp/KQ3vO/ufe9y8Z2dudeUvG9vOMpz3yuQ/h09vY8eztQO/1rGNsrS0+c8zwfN - q8s/9jCk8GR6/dlMrXkZmH+Aoc4gg6Y0KxS9HGQraCF1WZvLD2Qh2yOLK7XDNUgdIX2Q2tFRUQTkdcV+ - 3T0DeUhmaOvEtiPV4i+weYzUCr8m5kfJB462fRWSgpWRgdjauAmt8WzXA0iJcNz5Ia6nI90P6RZ5zgvF - V9qnvdU8JUafqAZRY0lxxheLxgVUltRL5i6bS9iv5DW+IPXRNZHNKU4pftkGmX+ChRaao/4oRSDkxBRx - Dqs26Aif8DhSfqvV37YJAaQZUmueVj++M9VSv902PWoBjMkojuHHr0e4bmJ204UkUBZQ9urVuAadLkJX - R8/IkeJlY64zi2N8em0jXEP5H8WHBX6fIzXC85TiCGgB78Pz4fETqY8vNi+RRgKDC6SR0LzfPB+pIJwL - qPm2diAl7Enen5FynwNjH0zeR5qObFfW99Nuv/Z+4EHz6ixBg1ZAFlB+FtYUdIW20LkXr1sOpzj/ArKA - 7oJR1t2pDyuQ9OTyg3LrriDdCXJhSONJXGBg4uXWGLyuIdnBH5ByEY67MAQ5EVQr/nMOSMmRBhwFd3EM - ciQ0VzzMHLH/uQ38DScNA3Ey6TV2OHC3i+s1EPqjlpbSXONrqFEw2q/X/59M5gZwQwBmYRNKogAAAABJ - RU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAYBJREFUWEft + lM9KwzAcx4sIwjqQTQU91j2DdOyk4lNsB1/AJxBkUpVOJqakhzag+AwevPsSvoMXbx4ERU3mNyWGdDat + dJd+4AfJ9/eXNKnT0GBLFLMvYdjWi2y+kAHU5rUPoDevdQC9aa0D6M0FtQ1gai5QdWEkTo46ne4y3P+D + 2gBShurTjVD2iLDyqAUh5bLj9zf5CYRqjjASpXcIsUMtAsmKiLKXrAZln5CLUbW5SqlaMmFtfaMLqRLW + QxCaXMqEluu2IFdC1iMxe4I0H3UISJWxrjeZRrFMcg0nIX0Ge+PxSwjLmFxF9z/+9BXS36hD6HdC6vNs + d+9gH+EzpI5tMfLuRF4xHh9Inx7Dn+SH2Pv+oA2pGKY7oe91XLe9ImOEnZ1PRyfji6FYE5o+IKw4+p2Q + a7hzOQ3CRMbyV3BbNM+IOoRNIW+7t1omz4j6OWwKeV7v1yeBXI6y/4lxEB7P8ih7hlQefqGurd404M3f + h6PDG2wXg98fbGHZ0AAc5xt8asXwHSUE5wAAAABJRU5ErkJggg== From 45787dd220ca4db5b9d0904036b4e964dd9355be Mon Sep 17 00:00:00 2001 From: HI <15012290903@163.com> Date: Thu, 11 Jul 2024 11:48:07 +0800 Subject: [PATCH 3/6] =?UTF-8?q?+=E7=94=9F=E6=88=90=E7=A7=91=E5=AE=A4?= =?UTF-8?q?=E5=B0=8F=E7=BB=93=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Model/Exam/PartModel.cs | 3 ++- PEIS/PEIS.csproj | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/PEIS/Model/Exam/PartModel.cs b/PEIS/Model/Exam/PartModel.cs index 63cdf02..9fcdb49 100644 --- a/PEIS/Model/Exam/PartModel.cs +++ b/PEIS/Model/Exam/PartModel.cs @@ -201,6 +201,7 @@ namespace PEIS.Model "3201", //放射科 "3202", //超声科 }; + var index = 1; results.GroupBy(g => g.FeeItemName).ToList().ForEach(items => { @@ -210,7 +211,7 @@ namespace PEIS.Model if (!deptCodeList.Contains(deptCode)) { summary += string.Join(Environment.NewLine, - items.Select(s => $@" {s.RptItemName}：{s.TextResult} {s.Unit} {s.UnusualFlag}").ToList()); + items.Select(s => $@" {s.RptItemName}：{s.TextResult} {s.Unit} {s.UnusualFlag}；").ToList()); } else { diff --git a/PEIS/PEIS.csproj b/PEIS/PEIS.csproj index 11838b8..83cf1cb 100644 --- a/PEIS/PEIS.csproj +++ b/PEIS/PEIS.csproj @@ -526,6 +526,7 @@ ViewBase.cs + Designer LoginForm.cs @@ -676,12 +677,11 @@ + + Always - - PreserveNewest - PreserveNewest From 7c1f8a3dc394965aa23426b23a02a0d0f0be881d Mon Sep 17 00:00:00 2001 From: lsm Date: Thu, 11 Jul 2024 15:22:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1=E3=80=81=E5=9B=A2=E4=BD=93=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=BA=BA=E5=91=98=EF=BC=8C2=E3=80=81=E9=80=80?= =?UTF-8?q?=E8=B4=B9=E8=AE=A2=E5=8D=95=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Entity/EnrollmentPatient.cs | 5 +- .../Enrollment/EnrollmentPatientModel.cs | 6 +- PEIS/Model/EnrollmentFeeItemModel.cs | 2 +- .../Enrollment/EnrollmentOrgForm.Designer.cs | 263 ++++++++++-------- PEIS/View/Enrollment/EnrollmentOrgForm.cs | 137 ++++++++- PEIS/View/Enrollment/EnrollmentPersonForm.cs | 6 + 6 files changed, 292 insertions(+), 127 deletions(-) diff --git a/PEIS/Entity/EnrollmentPatient.cs b/PEIS/Entity/EnrollmentPatient.cs index 87a6d49..3a5fbf0 100644 --- a/PEIS/Entity/EnrollmentPatient.cs +++ b/PEIS/Entity/EnrollmentPatient.cs @@ -101,7 +101,10 @@ namespace PEIS.Entity [RefFlag(true)] public DateTime? CostTime { get; set; } - + + [RefFlag(true)] + public Int64 RowNumber { get; set; } + #endregion Other } } \ No newline at end of file diff --git a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs index fa75aa7..7cfffa2 100644 --- a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs @@ -69,14 +69,14 @@ namespace PEIS.Model.Enrollment return DAOHelp.GetDataBySQL($@"Select a.Name, a.ID, a.SEX, - a.Age, - a.AgeClass, + CONVERT(VARCHAR,a.Age) + a.AgeClass AgeClass, b.BirthDay, a.CardNo, a.CardType, b.Marriage, c.DeptName AS GroupName, - a.SignTime, + a.SignTime, + a.Tel1, CASE WHEN a.SignTime IS NULL THEN NULL ELSE '已发送' diff --git a/PEIS/Model/EnrollmentFeeItemModel.cs b/PEIS/Model/EnrollmentFeeItemModel.cs index c8e7bee..aacdf38 100644 --- a/PEIS/Model/EnrollmentFeeItemModel.cs +++ b/PEIS/Model/EnrollmentFeeItemModel.cs @@ -33,7 +33,7 @@ namespace PEIS.Model public List GetItemsByEnrollmentID(Int64 enrollmentID) { - return DAOHelp.GetDataBySQL($"Select a.*, b.Address, c.IsHide From Enrollment_FeeItem a LEFT JOIN Dict_Dept b ON a.DeptCode = b.HISCode LEFT JOIN Dict_FeeItem c ON a.KeyNo = c.KeyNo Where a.EID = {enrollmentID} Order by a.OrderNo, a.DeptName"); + return DAOHelp.GetDataBySQL($"Select a.*, b.Address, c.IsHide From Enrollment_FeeItem a LEFT JOIN Dict_Dept b ON a.DeptCode = b.HISCode LEFT JOIN Dict_FeeItem c ON a.KeyNo = c.KeyNo Where a.EID = {enrollmentID} Order by a.PackName DESC, a.OrderNo, a.DeptName"); } public List GetItems4CheckCost(Int64 oeID, Int64 enrollmentID) diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs index 5da75bf..3ff3058 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs @@ -28,12 +28,13 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentOrgForm)); DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule(); DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression(); DevExpress.XtraGrid.GridFormatRule gridFormatRule2 = new DevExpress.XtraGrid.GridFormatRule(); DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression2 = new DevExpress.XtraEditors.FormatConditionRuleExpression(); + this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemMemoEdit21 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); this.panel1 = new System.Windows.Forms.Panel(); this.DgcOrg = new DevExpress.XtraGrid.GridControl(); @@ -66,7 +67,7 @@ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); this.DgcGroupPatient = new DevExpress.XtraGrid.GridControl(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(); this.FastGroupMove = new System.Windows.Forms.ToolStripMenuItem(); this.DgvGroupPatient = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -200,7 +201,7 @@ this.xtraTabControl4 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage(); this.DgcCheckCost2 = new DevExpress.XtraGrid.GridControl(); - this.PersonCostFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.PersonCostFastMenu = new System.Windows.Forms.ContextMenuStrip(); this.PFastCharge = new System.Windows.Forms.ToolStripMenuItem(); this.PFastAllCharge = new System.Windows.Forms.ToolStripMenuItem(); this.PFastDeleteCost = new System.Windows.Forms.ToolStripMenuItem(); @@ -224,14 +225,14 @@ this.gridColumn158 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn159 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn160 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn100 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); this.splitter6 = new System.Windows.Forms.Splitter(); this.panel12 = new System.Windows.Forms.Panel(); this.xtraTabControl3 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.DgcCheckCost = new DevExpress.XtraGrid.GridControl(); - this.TeamCostFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.TeamCostFastMenu = new System.Windows.Forms.ContextMenuStrip(); this.TFastCharge = new System.Windows.Forms.ToolStripMenuItem(); this.TFastAllCharge = new System.Windows.Forms.ToolStripMenuItem(); this.TFastDeleteCost = new System.Windows.Forms.ToolStripMenuItem(); @@ -255,6 +256,7 @@ this.gridColumn154 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn155 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn156 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn101 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemMemoEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); this.splitter5 = new System.Windows.Forms.Splitter(); this.panel8 = new System.Windows.Forms.Panel(); @@ -321,10 +323,11 @@ this.splitterControl1 = new DevExpress.XtraEditors.SplitterControl(); this.panel11 = new System.Windows.Forms.Panel(); this.DgcEnrollment = new DevExpress.XtraGrid.GridControl(); - this.InfoFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.InfoFastMenu = new System.Windows.Forms.ContextMenuStrip(); this.FastCamera = new System.Windows.Forms.ToolStripMenuItem(); this.FastDelete = new System.Windows.Forms.ToolStripMenuItem(); this.FastExport = new System.Windows.Forms.ToolStripMenuItem(); + this.FastExportTime = new System.Windows.Forms.ToolStripMenuItem(); this.FastRecall = new System.Windows.Forms.ToolStripMenuItem(); this.FastGroup = new System.Windows.Forms.ToolStripMenuItem(); this.FastCancelGroup = new System.Windows.Forms.ToolStripMenuItem(); @@ -335,13 +338,13 @@ this.gridColumn103 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn89 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn90 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn107 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn108 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn91 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn93 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn94 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn95 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn96 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn104 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn92 = new DevExpress.XtraGrid.Columns.GridColumn(); this.PatientSearch = new System.Windows.Forms.TextBox(); this.gridColumn109 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -374,9 +377,6 @@ this.gridView5 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView7 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView8 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gridColumn100 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn101 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit(); @@ -474,6 +474,42 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView8)).BeginInit(); this.SuspendLayout(); // + // gridColumn99 + // + this.gridColumn99.Caption = "退费时间"; + this.gridColumn99.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; + this.gridColumn99.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn99.FieldName = "CancelTime"; + this.gridColumn99.Name = "gridColumn99"; + this.gridColumn99.OptionsColumn.AllowEdit = false; + this.gridColumn99.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn99.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn99.OptionsColumn.AllowMove = false; + this.gridColumn99.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn99.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn99.OptionsColumn.ReadOnly = true; + this.gridColumn99.OptionsFilter.AllowFilter = false; + this.gridColumn99.Visible = true; + this.gridColumn99.VisibleIndex = 15; + // + // gridColumn102 + // + this.gridColumn102.Caption = "退费时间"; + this.gridColumn102.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; + this.gridColumn102.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn102.FieldName = "CancelTime"; + this.gridColumn102.Name = "gridColumn102"; + this.gridColumn102.OptionsColumn.AllowEdit = false; + this.gridColumn102.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn102.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn102.OptionsColumn.AllowMove = false; + this.gridColumn102.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn102.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn102.OptionsColumn.ReadOnly = true; + this.gridColumn102.OptionsFilter.AllowFilter = false; + this.gridColumn102.Visible = true; + this.gridColumn102.VisibleIndex = 15; + // // repositoryItemMemoEdit21 // this.repositoryItemMemoEdit21.Appearance.Options.UseTextOptions = true; @@ -2975,6 +3011,7 @@ this.gridColumn100, this.gridColumn99}); this.DgvCheckCost2.FixedLineWidth = 1; + gridFormatRule1.ApplyToRow = true; gridFormatRule1.Column = this.gridColumn99; gridFormatRule1.Name = "Format0"; formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Gray; @@ -3248,23 +3285,21 @@ this.gridColumn160.VisibleIndex = 13; this.gridColumn160.Width = 130; // - // gridColumn99 + // gridColumn100 // - this.gridColumn99.Caption = "退费时间"; - this.gridColumn99.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; - this.gridColumn99.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.gridColumn99.FieldName = "CancelTime"; - this.gridColumn99.Name = "gridColumn99"; - this.gridColumn99.OptionsColumn.AllowEdit = false; - this.gridColumn99.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn99.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn99.OptionsColumn.AllowMove = false; - this.gridColumn99.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn99.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn99.OptionsColumn.ReadOnly = true; - this.gridColumn99.OptionsFilter.AllowFilter = false; - this.gridColumn99.Visible = true; - this.gridColumn99.VisibleIndex = 15; + this.gridColumn100.Caption = "退费人"; + this.gridColumn100.FieldName = "Cancer"; + this.gridColumn100.Name = "gridColumn100"; + this.gridColumn100.OptionsColumn.AllowEdit = false; + this.gridColumn100.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn100.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn100.OptionsColumn.AllowMove = false; + this.gridColumn100.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn100.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn100.OptionsColumn.ReadOnly = true; + this.gridColumn100.OptionsFilter.AllowFilter = false; + this.gridColumn100.Visible = true; + this.gridColumn100.VisibleIndex = 14; // // repositoryItemMemoEdit2 // @@ -3715,6 +3750,22 @@ this.gridColumn156.VisibleIndex = 13; this.gridColumn156.Width = 130; // + // gridColumn101 + // + this.gridColumn101.Caption = "退费人"; + this.gridColumn101.FieldName = "Cancer"; + this.gridColumn101.Name = "gridColumn101"; + this.gridColumn101.OptionsColumn.AllowEdit = false; + this.gridColumn101.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn101.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn101.OptionsColumn.AllowMove = false; + this.gridColumn101.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn101.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn101.OptionsColumn.ReadOnly = true; + this.gridColumn101.OptionsFilter.AllowFilter = false; + this.gridColumn101.Visible = true; + this.gridColumn101.VisibleIndex = 14; + // // repositoryItemMemoEdit3 // this.repositoryItemMemoEdit3.Appearance.Options.UseTextOptions = true; @@ -4599,18 +4650,19 @@ this.FastCamera, this.FastDelete, this.FastExport, + this.FastExportTime, this.FastRecall, this.FastGroup, this.FastCancelGroup}); this.InfoFastMenu.Name = "CostFastMenu"; - this.InfoFastMenu.Size = new System.Drawing.Size(241, 220); + this.InfoFastMenu.Size = new System.Drawing.Size(337, 300); // // FastCamera // this.FastCamera.Image = ((System.Drawing.Image)(resources.GetObject("FastCamera.Image"))); this.FastCamera.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastCamera.Name = "FastCamera"; - this.FastCamera.Size = new System.Drawing.Size(240, 36); + this.FastCamera.Size = new System.Drawing.Size(336, 36); this.FastCamera.Text = "拍照"; // // FastDelete @@ -4618,33 +4670,40 @@ this.FastDelete.Image = ((System.Drawing.Image)(resources.GetObject("FastDelete.Image"))); this.FastDelete.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastDelete.Name = "FastDelete"; - this.FastDelete.Size = new System.Drawing.Size(240, 36); + this.FastDelete.Size = new System.Drawing.Size(336, 36); this.FastDelete.Text = "删除成员"; // // FastExport // this.FastExport.Image = global::PEIS.Properties.Resources.Excel; this.FastExport.Name = "FastExport"; - this.FastExport.Size = new System.Drawing.Size(240, 36); - this.FastExport.Text = "导出数据"; + this.FastExport.Size = new System.Drawing.Size(336, 36); + this.FastExport.Text = "导出所有成员"; + // + // FastExportTime + // + this.FastExportTime.Image = global::PEIS.Properties.Resources.Excel; + this.FastExportTime.Name = "FastExportTime"; + this.FastExportTime.Size = new System.Drawing.Size(336, 36); + this.FastExportTime.Text = "导出指定时间范围成员"; // // FastRecall // this.FastRecall.Image = global::PEIS.Properties.Resources.取消弃检; this.FastRecall.Name = "FastRecall"; - this.FastRecall.Size = new System.Drawing.Size(240, 36); + this.FastRecall.Size = new System.Drawing.Size(336, 36); this.FastRecall.Text = "撤回发送"; // // FastGroup // this.FastGroup.Name = "FastGroup"; - this.FastGroup.Size = new System.Drawing.Size(240, 36); + this.FastGroup.Size = new System.Drawing.Size(336, 36); this.FastGroup.Text = "组合缴费"; // // FastCancelGroup // this.FastCancelGroup.Name = "FastCancelGroup"; - this.FastCancelGroup.Size = new System.Drawing.Size(240, 36); + this.FastCancelGroup.Size = new System.Drawing.Size(336, 36); this.FastCancelGroup.Text = "取消组合缴费"; // // DgvEnrollment @@ -4663,13 +4722,13 @@ this.gridColumn103, this.gridColumn89, this.gridColumn90, - this.gridColumn107, this.gridColumn108, this.gridColumn91, this.gridColumn93, this.gridColumn94, this.gridColumn95, this.gridColumn96, + this.gridColumn104, this.gridColumn92}); this.DgvEnrollment.GridControl = this.DgcEnrollment; this.DgvEnrollment.GroupCount = 1; @@ -4738,6 +4797,8 @@ this.gridColumn103.Name = "gridColumn103"; this.gridColumn103.OptionsColumn.AllowEdit = false; this.gridColumn103.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn103.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn103.OptionsColumn.AllowMove = false; this.gridColumn103.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn103.OptionsColumn.ReadOnly = true; this.gridColumn103.OptionsFilter.AllowFilter = false; @@ -4756,6 +4817,8 @@ this.gridColumn89.Name = "gridColumn89"; this.gridColumn89.OptionsColumn.AllowEdit = false; this.gridColumn89.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn89.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn89.OptionsColumn.AllowMove = false; this.gridColumn89.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn89.OptionsColumn.ReadOnly = true; this.gridColumn89.OptionsFilter.AllowFilter = false; @@ -4774,6 +4837,8 @@ this.gridColumn90.Name = "gridColumn90"; this.gridColumn90.OptionsColumn.AllowEdit = false; this.gridColumn90.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn90.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn90.OptionsColumn.AllowMove = false; this.gridColumn90.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn90.OptionsColumn.ReadOnly = true; this.gridColumn90.OptionsFilter.AllowFilter = false; @@ -4781,40 +4846,24 @@ this.gridColumn90.VisibleIndex = 3; this.gridColumn90.Width = 40; // - // gridColumn107 - // - this.gridColumn107.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn107.AppearanceCell.Options.UseFont = true; - this.gridColumn107.AppearanceHeader.Options.UseTextOptions = true; - this.gridColumn107.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; - this.gridColumn107.Caption = "年龄"; - this.gridColumn107.FieldName = "Age"; - this.gridColumn107.Name = "gridColumn107"; - this.gridColumn107.OptionsColumn.AllowEdit = false; - this.gridColumn107.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn107.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn107.OptionsColumn.ReadOnly = true; - this.gridColumn107.OptionsFilter.AllowFilter = false; - this.gridColumn107.Visible = true; - this.gridColumn107.VisibleIndex = 4; - this.gridColumn107.Width = 40; - // // gridColumn108 // this.gridColumn108.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn108.AppearanceCell.Options.UseFont = true; this.gridColumn108.AppearanceHeader.Options.UseTextOptions = true; this.gridColumn108.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; - this.gridColumn108.Caption = " "; + this.gridColumn108.Caption = "年龄"; this.gridColumn108.FieldName = "AgeClass"; this.gridColumn108.Name = "gridColumn108"; this.gridColumn108.OptionsColumn.AllowEdit = false; this.gridColumn108.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn108.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn108.OptionsColumn.AllowMove = false; this.gridColumn108.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn108.OptionsColumn.ReadOnly = true; this.gridColumn108.OptionsFilter.AllowFilter = false; this.gridColumn108.Visible = true; - this.gridColumn108.VisibleIndex = 5; + this.gridColumn108.VisibleIndex = 4; this.gridColumn108.Width = 30; // // gridColumn91 @@ -4826,10 +4875,12 @@ this.gridColumn91.Name = "gridColumn91"; this.gridColumn91.OptionsColumn.AllowEdit = false; this.gridColumn91.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn91.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn91.OptionsColumn.AllowMove = false; this.gridColumn91.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn91.OptionsColumn.ReadOnly = true; this.gridColumn91.Visible = true; - this.gridColumn91.VisibleIndex = 6; + this.gridColumn91.VisibleIndex = 5; // // gridColumn93 // @@ -4842,11 +4893,14 @@ this.gridColumn93.Name = "gridColumn93"; this.gridColumn93.OptionsColumn.AllowEdit = false; this.gridColumn93.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn93.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn93.OptionsColumn.AllowMove = false; this.gridColumn93.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn93.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn93.OptionsColumn.ReadOnly = true; this.gridColumn93.OptionsFilter.AllowFilter = false; this.gridColumn93.Visible = true; - this.gridColumn93.VisibleIndex = 7; + this.gridColumn93.VisibleIndex = 6; this.gridColumn93.Width = 60; // // gridColumn94 @@ -4860,13 +4914,16 @@ this.gridColumn94.Name = "gridColumn94"; this.gridColumn94.OptionsColumn.AllowEdit = false; this.gridColumn94.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn94.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn94.OptionsColumn.AllowMove = false; this.gridColumn94.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn94.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn94.OptionsColumn.ReadOnly = true; this.gridColumn94.OptionsFilter.AllowFilter = false; this.gridColumn94.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] { new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Count, "BloodCode", "合计：{0} 个血袋")}); this.gridColumn94.Visible = true; - this.gridColumn94.VisibleIndex = 8; + this.gridColumn94.VisibleIndex = 7; this.gridColumn94.Width = 100; // // gridColumn95 @@ -4880,11 +4937,14 @@ this.gridColumn95.Name = "gridColumn95"; this.gridColumn95.OptionsColumn.AllowEdit = false; this.gridColumn95.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn95.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn95.OptionsColumn.AllowMove = false; this.gridColumn95.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn95.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn95.OptionsColumn.ReadOnly = true; this.gridColumn95.OptionsFilter.AllowFilter = false; this.gridColumn95.Visible = true; - this.gridColumn95.VisibleIndex = 9; + this.gridColumn95.VisibleIndex = 8; this.gridColumn95.Width = 80; // // gridColumn96 @@ -4898,13 +4958,34 @@ this.gridColumn96.Name = "gridColumn96"; this.gridColumn96.OptionsColumn.AllowEdit = false; this.gridColumn96.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn96.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn96.OptionsColumn.AllowMove = false; this.gridColumn96.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn96.OptionsColumn.ReadOnly = true; this.gridColumn96.OptionsFilter.AllowFilter = false; this.gridColumn96.Visible = true; - this.gridColumn96.VisibleIndex = 10; + this.gridColumn96.VisibleIndex = 9; this.gridColumn96.Width = 160; // + // gridColumn104 + // + this.gridColumn104.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn104.AppearanceCell.Options.UseFont = true; + this.gridColumn104.Caption = "签到时间"; + this.gridColumn104.FieldName = "SignTime"; + this.gridColumn104.GroupFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; + this.gridColumn104.GroupFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn104.Name = "gridColumn104"; + this.gridColumn104.OptionsColumn.AllowEdit = false; + this.gridColumn104.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn104.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn104.OptionsColumn.AllowMove = false; + this.gridColumn104.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn104.OptionsColumn.ReadOnly = true; + this.gridColumn104.OptionsFilter.AllowFilter = false; + this.gridColumn104.Visible = true; + this.gridColumn104.VisibleIndex = 11; + // // gridColumn92 // this.gridColumn92.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -4912,8 +4993,15 @@ this.gridColumn92.Caption = "状态"; this.gridColumn92.FieldName = "Signer"; this.gridColumn92.Name = "gridColumn92"; + this.gridColumn92.OptionsColumn.AllowEdit = false; + this.gridColumn92.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn92.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn92.OptionsColumn.AllowMove = false; + this.gridColumn92.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn92.OptionsColumn.ReadOnly = true; + this.gridColumn92.OptionsFilter.AllowFilter = false; this.gridColumn92.Visible = true; - this.gridColumn92.VisibleIndex = 11; + this.gridColumn92.VisibleIndex = 10; // // PatientSearch // @@ -5134,56 +5222,6 @@ // this.gridView8.Name = "gridView8"; // - // gridColumn100 - // - this.gridColumn100.Caption = "退费人"; - this.gridColumn100.FieldName = "Cancer"; - this.gridColumn100.Name = "gridColumn100"; - this.gridColumn100.OptionsColumn.AllowEdit = false; - this.gridColumn100.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn100.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn100.OptionsColumn.AllowMove = false; - this.gridColumn100.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn100.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn100.OptionsColumn.ReadOnly = true; - this.gridColumn100.OptionsFilter.AllowFilter = false; - this.gridColumn100.Visible = true; - this.gridColumn100.VisibleIndex = 14; - // - // gridColumn101 - // - this.gridColumn101.Caption = "退费人"; - this.gridColumn101.FieldName = "Cancer"; - this.gridColumn101.Name = "gridColumn101"; - this.gridColumn101.OptionsColumn.AllowEdit = false; - this.gridColumn101.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn101.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn101.OptionsColumn.AllowMove = false; - this.gridColumn101.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn101.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn101.OptionsColumn.ReadOnly = true; - this.gridColumn101.OptionsFilter.AllowFilter = false; - this.gridColumn101.Visible = true; - this.gridColumn101.VisibleIndex = 14; - // - // gridColumn102 - // - this.gridColumn102.Caption = "退费时间"; - this.gridColumn102.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; - this.gridColumn102.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.gridColumn102.FieldName = "CancelTime"; - this.gridColumn102.Name = "gridColumn102"; - this.gridColumn102.OptionsColumn.AllowEdit = false; - this.gridColumn102.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn102.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn102.OptionsColumn.AllowMove = false; - this.gridColumn102.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn102.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn102.OptionsColumn.ReadOnly = true; - this.gridColumn102.OptionsFilter.AllowFilter = false; - this.gridColumn102.Visible = true; - this.gridColumn102.VisibleIndex = 15; - // // EnrollmentOrgForm // this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F); @@ -5388,7 +5426,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn95; private DevExpress.XtraGrid.Columns.GridColumn gridColumn96; private DevExpress.XtraGrid.Columns.GridColumn gridColumn103; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn107; private DevExpress.XtraGrid.Columns.GridColumn gridColumn108; private DevExpress.XtraGrid.Columns.GridColumn gridColumn109; private System.Windows.Forms.Splitter splitter8; @@ -5648,5 +5685,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn100; private DevExpress.XtraGrid.Columns.GridColumn gridColumn101; private DevExpress.XtraGrid.Columns.GridColumn gridColumn102; + private System.Windows.Forms.ToolStripMenuItem FastExportTime; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn104; } } \ No newline at end of file diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index 21cf424..fc60635 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -1,4 +1,7 @@ -using DevExpress.XtraGrid.Views.Grid.ViewInfo; +using DevExpress.Utils; +using DevExpress.XtraGrid.Columns; +using DevExpress.XtraGrid.Views.Grid; +using DevExpress.XtraGrid.Views.Grid.ViewInfo; using DevExpress.XtraPrinting.Native; using PEIS.Base; using PEIS.Entity; @@ -8,6 +11,7 @@ using PEIS.Utils; using PEIS.View.Base; using System; using System.Collections.Generic; +using System.Data; using System.Drawing; using System.Globalization; using System.Linq; @@ -153,6 +157,7 @@ namespace PEIS.View.Enrollment FeeItemSearch2.TextChanged += FeeItemSearch2_TextChanged; FastGroupMove.Click += FastGroupMove_Click; FastExport.Click += FastExport_Click; + FastExportTime.Click += FastExportTime_Click; FastDelete.Click += FastDelete_Click; FastGroup.Click += FastGroup_Click; FastCancelGroup.Click += FastCancelGroup_Click; @@ -847,7 +852,7 @@ namespace PEIS.View.Enrollment } } - private void FastExport_Click(object sender, EventArgs e) // 导出团体成员 + private void FastExport_Click(object sender, EventArgs e) // 导出所有团体成员 { if (_lstEnrollmentPatient.Count != 0) { @@ -863,12 +868,112 @@ namespace PEIS.View.Enrollment options.TextExportMode = DevExpress.XtraPrinting.TextExportMode.Value; options.ExportType = DevExpress.Export.ExportType.WYSIWYG; + // 首先，创建一个新的列对象 + GridColumn newColumn = new GridColumn(); + // 设置列的标题，例如"序号" + newColumn.Caption = "序号"; + // 设置列的字段名称，这将用于数据绑定 + newColumn.FieldName = "RowNumber"; + newColumn.VisibleIndex = 0; + newColumn.AppearanceCell.Font = new Font("微软雅黑", 12); + + // 将列添加到GridView的Columns集合中 + DgvEnrollment.Columns.Add(newColumn); + + for (int i = 0; i < _lstEnrollmentPatient.Count(); i++) + { + // 使用GetRowCellValue方法获取当前行的序号列的值 + int rowNumber = DgvEnrollment.GetRowHandle(i); // 行句柄 + DgvEnrollment.SetRowCellValue(rowNumber, "RowNumber", i + 1); // 设置序号列的值 + } DgcEnrollment.ExportToXls(saveFileDialog.FileName, options); - + DgvEnrollment.Columns.Remove(newColumn); } } + } + + private void FastExportTime_Click(object sender, EventArgs e) // 导出指定时间范围成员 + { + DateTime currentDate = DateTime.Now; + + Form dateForm = new Form(); + dateForm.Font = new Font("微软雅黑", 12); + dateForm.Text = "时间选择器"; + dateForm.StartPosition = FormStartPosition.CenterScreen; + dateForm.Size = new Size(330, 226); + Label begLabel = new Label(); + begLabel.Location = new Point(10, 20); + begLabel.Text = "开始时间："; + + DateTimePicker begTime = new DateTimePicker(); + begTime.Location = new Point(110, 20); + begTime.Value = currentDate.AddDays(-6); + + Label endLabel = new Label(); + endLabel.Location = new Point(10, 70); + endLabel.Text = "结束时间："; + + DateTimePicker endTime = new DateTimePicker(); + endTime.Location = new Point(110, 70); + endTime.Value = currentDate; + + Button confirmBtn = new Button(); + confirmBtn.Text = "确认选择"; + confirmBtn.Location = new Point(110, 120); + confirmBtn.AutoSize = true; + confirmBtn.Click += delegate (object a, EventArgs b) + { + if (_lstEnrollmentPatient.Count != 0) + { + SaveFileDialog saveFileDialog = new SaveFileDialog(); + saveFileDialog.Title = "导出Excel"; + saveFileDialog.FileName = "团体名单"; + saveFileDialog.Filter = "Excel文件(*.xls)|*.xls"; + DialogResult dialogResult = saveFileDialog.ShowDialog(this); + if (dialogResult == DialogResult.OK) + { + DevExpress.XtraPrinting.XlsExportOptionsEx options = new DevExpress.XtraPrinting.XlsExportOptionsEx(); + options.ShowGridLines = true; + options.TextExportMode = DevExpress.XtraPrinting.TextExportMode.Value; + options.ExportType = DevExpress.Export.ExportType.WYSIWYG; + + // 首先，创建一个新的列对象 + GridColumn newColumn = new GridColumn(); + // 设置列的标题，例如"序号" + newColumn.Caption = "序号"; + // 设置列的字段名称，这将用于数据绑定 + newColumn.FieldName = "RowNumber"; + newColumn.VisibleIndex = 0; + newColumn.AppearanceCell.Font = new Font("微软雅黑", 12); + + // 将列添加到GridView的Columns集合中 + DgvEnrollment.Columns.Add(newColumn); + + + DgcEnrollment.DataSource = _lstEnrollmentPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date); + for (int i = 0; i < _lstEnrollmentPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date).Count(); i++) + { + // 使用GetRowCellValue方法获取当前行的序号列的值 + int rowNumber = DgvEnrollment.GetRowHandle(i); // 行句柄 + DgvEnrollment.SetRowCellValue(rowNumber, "RowNumber", i + 1); // 设置序号列的值 + } + + DgcEnrollment.ExportToXls(saveFileDialog.FileName, options); + DgvEnrollment.Columns.Remove(newColumn); + } + } + ShowEnrollmentPatient(_lstEnrollmentPatient); + dateForm.Close(); + }; + + dateForm.Controls.Add(begLabel); + dateForm.Controls.Add(begTime); + dateForm.Controls.Add(endLabel); + dateForm.Controls.Add(endTime); + dateForm.Controls.Add(confirmBtn); + dateForm.ShowDialog(); } private void FastDelete_Click(object sender, EventArgs e) // 删除未签到成员 @@ -878,7 +983,7 @@ namespace PEIS.View.Enrollment OnCancelRegInfo(item.ID); } - private void DgvEnrollment_RowCellClick(object sender, DevExpress.XtraGrid.Views.Grid.RowCellClickEventArgs e) + private void DgvEnrollment_RowCellClick(object sender, RowCellClickEventArgs e) { if (e.Column.AbsoluteIndex == 0) { @@ -1056,6 +1161,12 @@ namespace PEIS.View.Enrollment return; } + if(item?.CancelTime != null) + { + Global.Msg("info", "该订单为退费订单留存记录，不能删除！"); + return; + } + if (item == null) return; OnDeleteOrder(item.ID); OnGetCheckCost(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()), _chooseRegItem.ID); @@ -1168,6 +1279,12 @@ namespace PEIS.View.Enrollment return; } + if (item?.CancelTime != null) + { + Global.Msg("info", "该订单为退费订单留存记录，不能删除！"); + return; + } + if (item == null) return; OnDeleteOrder(item.ID); OnGetCheckCost(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()), _chooseRegItem.ID); @@ -1216,7 +1333,7 @@ namespace PEIS.View.Enrollment #endregion 交互事件 - private void DgvCheckCost_RowStyle(object sender, DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs e) + private void DgvCheckCost_RowStyle(object sender, RowStyleEventArgs e) { if (DgvCheckCost.RowCount == 0) return; if (DgvCheckCost.GetRowCellValue(e.RowHandle, "SendTime") != null) @@ -1235,7 +1352,7 @@ namespace PEIS.View.Enrollment e.Appearance.ForeColor = Color.Black; } - private void DgvCheckCost2_RowStyle(object sender, DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs e) + private void DgvCheckCost2_RowStyle(object sender, RowStyleEventArgs e) { if (DgvCheckCost2.RowCount == 0) return; if (DgvCheckCost2.GetRowCellValue(e.RowHandle, "SendTime") != null) @@ -1261,7 +1378,7 @@ namespace PEIS.View.Enrollment grid.GroupText = Convert.ToBoolean(DgvCheckCost.GetRowCellValue(index, "GroupTag")) ? "分组缴费订单" : "未分组缴费订单"; } - private void DgvEnrollmentFeeItem_RowStyle(object sender, DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs e) + private void DgvEnrollmentFeeItem_RowStyle(object sender, RowStyleEventArgs e) { if (DgvEnrollmentFeeItem.RowCount == 0) return; e.Appearance.ForeColor = DgvEnrollmentFeeItem.GetRowCellValue(e.RowHandle, "OrderNo") == null ? Color.Black : Color.DodgerBlue; @@ -1335,7 +1452,7 @@ namespace PEIS.View.Enrollment splitter7.Visible = PnlFeeItem.Visible; } - private void DgvOrg_CustomDrawRowIndicator(object sender, DevExpress.XtraGrid.Views.Grid.RowIndicatorCustomDrawEventArgs e) + private void DgvOrg_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e) { if (e.RowHandle >= 0) e.Info.DisplayText = (e.RowHandle + 1).ToString(); @@ -1403,13 +1520,13 @@ namespace PEIS.View.Enrollment } } - private void DgvGroupPatient_CustomDrawRowIndicator(object sender, DevExpress.XtraGrid.Views.Grid.RowIndicatorCustomDrawEventArgs e) + private void DgvGroupPatient_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e) { if (e.RowHandle >= 0) e.Info.DisplayText = (e.RowHandle + 1).ToString(); } - private void DgvPatient_CustomDrawRowIndicator(object sender, DevExpress.XtraGrid.Views.Grid.RowIndicatorCustomDrawEventArgs e) + private void DgvPatient_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e) { if (e.RowHandle >= 0) e.Info.DisplayText = (e.RowHandle + 1).ToString(); diff --git a/PEIS/View/Enrollment/EnrollmentPersonForm.cs b/PEIS/View/Enrollment/EnrollmentPersonForm.cs index cc0983b..a86fa90 100644 --- a/PEIS/View/Enrollment/EnrollmentPersonForm.cs +++ b/PEIS/View/Enrollment/EnrollmentPersonForm.cs @@ -649,6 +649,12 @@ namespace PEIS.View.Enrollment return; } + if (item?.CancelTime != null) + { + Global.Msg("info", "该订单为退费订单留存记录，不能删除！"); + return; + } + OnDeleteOrder(item.ID); } From 20fb078697da4b7069550b023bbfab2e07b300cd Mon Sep 17 00:00:00 2001 From: lsm Date: Thu, 11 Jul 2024 15:33:45 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1=E3=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs index 3ff3058..d6d6cf7 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs @@ -4699,12 +4699,14 @@ this.FastGroup.Name = "FastGroup"; this.FastGroup.Size = new System.Drawing.Size(336, 36); this.FastGroup.Text = "组合缴费"; + this.FastGroup.Visible = false; // // FastCancelGroup // this.FastCancelGroup.Name = "FastCancelGroup"; this.FastCancelGroup.Size = new System.Drawing.Size(336, 36); this.FastCancelGroup.Text = "取消组合缴费"; + this.FastCancelGroup.Visible = false; // // DgvEnrollment // From 1f4aead5ce025ed0960469238bb6a3b55ace782a Mon Sep 17 00:00:00 2001 From: zlysdm Date: Thu, 11 Jul 2024 21:06:03 +0800 Subject: [PATCH 6/6] =?UTF-8?q?1=E3=80=81=E5=9B=A2=E4=BD=93=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=90=8D=E5=8D=95=E5=8A=A0=E5=85=A5=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Enrollment/EnrollmentOrgForm.Designer.cs | 498 +++++++++--------- PEIS/View/Enrollment/EnrollmentOrgForm.resx | 16 +- 2 files changed, 246 insertions(+), 268 deletions(-) diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs index d6d6cf7..1143ca5 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentOrgForm)); DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule(); DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression(); @@ -67,7 +68,7 @@ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); this.DgcGroupPatient = new DevExpress.XtraGrid.GridControl(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.FastGroupMove = new System.Windows.Forms.ToolStripMenuItem(); this.DgvGroupPatient = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -201,7 +202,7 @@ this.xtraTabControl4 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage(); this.DgcCheckCost2 = new DevExpress.XtraGrid.GridControl(); - this.PersonCostFastMenu = new System.Windows.Forms.ContextMenuStrip(); + this.PersonCostFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.PFastCharge = new System.Windows.Forms.ToolStripMenuItem(); this.PFastAllCharge = new System.Windows.Forms.ToolStripMenuItem(); this.PFastDeleteCost = new System.Windows.Forms.ToolStripMenuItem(); @@ -232,7 +233,7 @@ this.xtraTabControl3 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.DgcCheckCost = new DevExpress.XtraGrid.GridControl(); - this.TeamCostFastMenu = new System.Windows.Forms.ContextMenuStrip(); + this.TeamCostFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.TFastCharge = new System.Windows.Forms.ToolStripMenuItem(); this.TFastAllCharge = new System.Windows.Forms.ToolStripMenuItem(); this.TFastDeleteCost = new System.Windows.Forms.ToolStripMenuItem(); @@ -323,7 +324,7 @@ this.splitterControl1 = new DevExpress.XtraEditors.SplitterControl(); this.panel11 = new System.Windows.Forms.Panel(); this.DgcEnrollment = new DevExpress.XtraGrid.GridControl(); - this.InfoFastMenu = new System.Windows.Forms.ContextMenuStrip(); + this.InfoFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.FastCamera = new System.Windows.Forms.ToolStripMenuItem(); this.FastDelete = new System.Windows.Forms.ToolStripMenuItem(); this.FastExport = new System.Windows.Forms.ToolStripMenuItem(); @@ -377,6 +378,7 @@ this.gridView5 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView7 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView8 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit(); @@ -523,20 +525,18 @@ this.panel1.Controls.Add(this.panel2); this.panel1.Dock = System.Windows.Forms.DockStyle.Left; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(6); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(471, 1759); + this.panel1.Size = new System.Drawing.Size(236, 779); this.panel1.TabIndex = 0; // // DgcOrg // this.DgcOrg.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcOrg.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(8); - this.DgcOrg.Location = new System.Drawing.Point(0, 298); + this.DgcOrg.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.DgcOrg.Location = new System.Drawing.Point(0, 163); this.DgcOrg.MainView = this.DgvOrg; - this.DgcOrg.Margin = new System.Windows.Forms.Padding(6); this.DgcOrg.Name = "DgcOrg"; - this.DgcOrg.Size = new System.Drawing.Size(471, 1461); + this.DgcOrg.Size = new System.Drawing.Size(236, 616); this.DgcOrg.TabIndex = 127; this.DgcOrg.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvOrg}); @@ -731,9 +731,8 @@ this.panel2.Controls.Add(this.groupBox2); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Margin = new System.Windows.Forms.Padding(6); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(471, 298); + this.panel2.Size = new System.Drawing.Size(236, 163); this.panel2.TabIndex = 0; // // groupBox2 @@ -748,10 +747,10 @@ this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 9F); this.groupBox2.Location = new System.Drawing.Point(0, 0); - this.groupBox2.Margin = new System.Windows.Forms.Padding(0, 0, 5, 0); + this.groupBox2.Margin = new System.Windows.Forms.Padding(0, 0, 2, 0); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.groupBox2.Size = new System.Drawing.Size(471, 298); + this.groupBox2.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.groupBox2.Size = new System.Drawing.Size(236, 163); this.groupBox2.TabIndex = 131; this.groupBox2.TabStop = false; this.groupBox2.Text = "快速查询"; @@ -760,19 +759,19 @@ // this.NameSearch.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.NameSearch.Font = new System.Drawing.Font("微软雅黑", 9F); - this.NameSearch.Location = new System.Drawing.Point(126, 43); - this.NameSearch.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.NameSearch.Location = new System.Drawing.Point(63, 24); + this.NameSearch.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.NameSearch.Name = "NameSearch"; - this.NameSearch.Size = new System.Drawing.Size(302, 39); + this.NameSearch.Size = new System.Drawing.Size(152, 23); this.NameSearch.TabIndex = 133; // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(8, 45); - this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label16.Location = new System.Drawing.Point(4, 25); + this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(110, 31); + this.label16.Size = new System.Drawing.Size(56, 17); this.label16.TabIndex = 132; this.label16.Text = "模糊检索"; // @@ -788,10 +787,10 @@ this.toolStripMenuItem10, this.TsmiOrgAdd}); this.menuStrip2.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; - this.menuStrip2.Location = new System.Drawing.Point(5, 251); + this.menuStrip2.Location = new System.Drawing.Point(2, 126); this.menuStrip2.Name = "menuStrip2"; - this.menuStrip2.Padding = new System.Windows.Forms.Padding(5, 3, 0, 3); - this.menuStrip2.Size = new System.Drawing.Size(461, 41); + this.menuStrip2.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2); + this.menuStrip2.Size = new System.Drawing.Size(232, 34); this.menuStrip2.TabIndex = 131; this.menuStrip2.Text = "menuStrip2"; // @@ -801,13 +800,13 @@ this.TsmiOrgRefresh.Image = global::PEIS.Properties.Resources.刷新; this.TsmiOrgRefresh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiOrgRefresh.Name = "TsmiOrgRefresh"; - this.TsmiOrgRefresh.Size = new System.Drawing.Size(100, 35); + this.TsmiOrgRefresh.Size = new System.Drawing.Size(70, 30); this.TsmiOrgRefresh.Text = "刷新"; // // toolStripMenuItem10 // this.toolStripMenuItem10.Name = "toolStripMenuItem10"; - this.toolStripMenuItem10.Size = new System.Drawing.Size(33, 35); + this.toolStripMenuItem10.Size = new System.Drawing.Size(24, 30); this.toolStripMenuItem10.Text = " "; // // TsmiOrgAdd @@ -816,16 +815,16 @@ this.TsmiOrgAdd.Image = global::PEIS.Properties.Resources.添加; this.TsmiOrgAdd.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiOrgAdd.Name = "TsmiOrgAdd"; - this.TsmiOrgAdd.Size = new System.Drawing.Size(100, 35); + this.TsmiOrgAdd.Size = new System.Drawing.Size(70, 30); this.TsmiOrgAdd.Text = "登记"; // // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(8, 188); - this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label19.Location = new System.Drawing.Point(4, 103); + this.label19.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(110, 31); + this.label19.Size = new System.Drawing.Size(56, 17); this.label19.TabIndex = 63; this.label19.Text = "终止日期"; // @@ -835,10 +834,10 @@ this.DtpEndDate.CustomFormat = " yyyy 年 MM 月 dd 日"; this.DtpEndDate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.DtpEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.DtpEndDate.Location = new System.Drawing.Point(126, 180); - this.DtpEndDate.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.DtpEndDate.Location = new System.Drawing.Point(63, 99); + this.DtpEndDate.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.DtpEndDate.Name = "DtpEndDate"; - this.DtpEndDate.Size = new System.Drawing.Size(304, 39); + this.DtpEndDate.Size = new System.Drawing.Size(154, 23); this.DtpEndDate.TabIndex = 62; this.DtpEndDate.Value = new System.DateTime(2023, 9, 12, 0, 0, 0, 0); // @@ -848,41 +847,40 @@ this.DtpBegDate.CustomFormat = " yyyy 年 MM 月 dd 日"; this.DtpBegDate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.DtpBegDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.DtpBegDate.Location = new System.Drawing.Point(126, 112); - this.DtpBegDate.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.DtpBegDate.Location = new System.Drawing.Point(63, 61); + this.DtpBegDate.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.DtpBegDate.Name = "DtpBegDate"; - this.DtpBegDate.Size = new System.Drawing.Size(304, 39); + this.DtpBegDate.Size = new System.Drawing.Size(154, 23); this.DtpBegDate.TabIndex = 61; this.DtpBegDate.Value = new System.DateTime(2023, 9, 12, 0, 0, 0, 0); // // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(8, 121); - this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label15.Location = new System.Drawing.Point(4, 66); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(110, 31); + this.label15.Size = new System.Drawing.Size(56, 17); this.label15.TabIndex = 9; this.label15.Text = "起始日期"; // // splitter1 // this.splitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); - this.splitter1.Location = new System.Drawing.Point(471, 0); - this.splitter1.Margin = new System.Windows.Forms.Padding(2); + this.splitter1.Location = new System.Drawing.Point(236, 0); + this.splitter1.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1); this.splitter1.Name = "splitter1"; - this.splitter1.Size = new System.Drawing.Size(8, 1759); + this.splitter1.Size = new System.Drawing.Size(4, 779); this.splitter1.TabIndex = 1; this.splitter1.TabStop = false; // // TcOrg // this.TcOrg.Dock = System.Windows.Forms.DockStyle.Fill; - this.TcOrg.Location = new System.Drawing.Point(479, 0); - this.TcOrg.Margin = new System.Windows.Forms.Padding(6); + this.TcOrg.Location = new System.Drawing.Point(240, 0); this.TcOrg.Name = "TcOrg"; this.TcOrg.SelectedTabPage = this.TpGroup; - this.TcOrg.Size = new System.Drawing.Size(2405, 1759); + this.TcOrg.Size = new System.Drawing.Size(1202, 779); this.TcOrg.TabIndex = 35; this.TcOrg.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.TpGroup, @@ -898,19 +896,17 @@ this.TpGroup.Controls.Add(this.DgcGroup); this.TpGroup.Controls.Add(this.panel3); this.TpGroup.Image = global::PEIS.Properties.Resources.套餐; - this.TpGroup.Margin = new System.Windows.Forms.Padding(6); this.TpGroup.Name = "TpGroup"; - this.TpGroup.Size = new System.Drawing.Size(2393, 1702); + this.TpGroup.Size = new System.Drawing.Size(1196, 736); this.TpGroup.Text = "团体分组"; // // xtraTabControl1 // this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.xtraTabControl1.Location = new System.Drawing.Point(0, 344); - this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(6); + this.xtraTabControl1.Location = new System.Drawing.Point(0, 189); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl1.Size = new System.Drawing.Size(1316, 1358); + this.xtraTabControl1.Size = new System.Drawing.Size(658, 547); this.xtraTabControl1.TabIndex = 131; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1}); @@ -918,23 +914,20 @@ // xtraTabPage1 // this.xtraTabPage1.Controls.Add(this.DgcGroupPatient); - this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(6); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1304, 1301); + this.xtraTabPage1.Size = new System.Drawing.Size(652, 518); this.xtraTabPage1.Text = "已分组成员"; // // DgcGroupPatient // this.DgcGroupPatient.ContextMenuStrip = this.contextMenuStrip1; this.DgcGroupPatient.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcGroupPatient.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); this.DgcGroupPatient.Location = new System.Drawing.Point(0, 0); this.DgcGroupPatient.MainView = this.DgvGroupPatient; - this.DgcGroupPatient.Margin = new System.Windows.Forms.Padding(6); this.DgcGroupPatient.Name = "DgcGroupPatient"; this.DgcGroupPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemImageEdit2}); - this.DgcGroupPatient.Size = new System.Drawing.Size(1304, 1301); + this.DgcGroupPatient.Size = new System.Drawing.Size(652, 518); this.DgcGroupPatient.TabIndex = 132; this.DgcGroupPatient.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvGroupPatient}); @@ -945,13 +938,13 @@ this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FastGroupMove}); this.contextMenuStrip1.Name = "CostFastMenu"; - this.contextMenuStrip1.Size = new System.Drawing.Size(185, 40); + this.contextMenuStrip1.Size = new System.Drawing.Size(125, 26); // // FastGroupMove // this.FastGroupMove.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastGroupMove.Name = "FastGroupMove"; - this.FastGroupMove.Size = new System.Drawing.Size(184, 36); + this.FastGroupMove.Size = new System.Drawing.Size(124, 22); this.FastGroupMove.Text = "批量移除"; // // DgvGroupPatient @@ -1265,21 +1258,20 @@ // this.splitter3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); this.splitter3.Dock = System.Windows.Forms.DockStyle.Right; - this.splitter3.Location = new System.Drawing.Point(1316, 344); - this.splitter3.Margin = new System.Windows.Forms.Padding(2); + this.splitter3.Location = new System.Drawing.Point(658, 189); + this.splitter3.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1); this.splitter3.Name = "splitter3"; - this.splitter3.Size = new System.Drawing.Size(8, 1358); + this.splitter3.Size = new System.Drawing.Size(4, 547); this.splitter3.TabIndex = 135; this.splitter3.TabStop = false; // // xtraTabControl2 // this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Right; - this.xtraTabControl2.Location = new System.Drawing.Point(1324, 344); - this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(6); + this.xtraTabControl2.Location = new System.Drawing.Point(662, 189); this.xtraTabControl2.Name = "xtraTabControl2"; this.xtraTabControl2.SelectedTabPage = this.xtraTabPage3; - this.xtraTabControl2.Size = new System.Drawing.Size(1069, 1358); + this.xtraTabControl2.Size = new System.Drawing.Size(534, 547); this.xtraTabControl2.TabIndex = 134; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage3}); @@ -1288,22 +1280,19 @@ // this.xtraTabPage3.Controls.Add(this.DgcPatient); this.xtraTabPage3.Controls.Add(this.panel10); - this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(6); this.xtraTabPage3.Name = "xtraTabPage3"; - this.xtraTabPage3.Size = new System.Drawing.Size(1057, 1301); + this.xtraTabPage3.Size = new System.Drawing.Size(528, 518); this.xtraTabPage3.Text = "未分组成员"; // // DgcPatient // this.DgcPatient.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcPatient.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); - this.DgcPatient.Location = new System.Drawing.Point(0, 68); + this.DgcPatient.Location = new System.Drawing.Point(0, 37); this.DgcPatient.MainView = this.DgvPatient; - this.DgcPatient.Margin = new System.Windows.Forms.Padding(6); this.DgcPatient.Name = "DgcPatient"; this.DgcPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemImageEdit1}); - this.DgcPatient.Size = new System.Drawing.Size(1057, 1233); + this.DgcPatient.Size = new System.Drawing.Size(528, 481); this.DgcPatient.TabIndex = 133; this.DgcPatient.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvPatient}); @@ -1621,19 +1610,17 @@ this.panel10.Controls.Add(this.RbAll); this.panel10.Dock = System.Windows.Forms.DockStyle.Top; this.panel10.Location = new System.Drawing.Point(0, 0); - this.panel10.Margin = new System.Windows.Forms.Padding(6); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(1057, 68); + this.panel10.Size = new System.Drawing.Size(528, 37); this.panel10.TabIndex = 132; // // ImportBtn // this.ImportBtn.AutoSize = true; this.ImportBtn.Image = ((System.Drawing.Image)(resources.GetObject("ImportBtn.Image"))); - this.ImportBtn.Location = new System.Drawing.Point(812, 3); - this.ImportBtn.Margin = new System.Windows.Forms.Padding(6); + this.ImportBtn.Location = new System.Drawing.Point(406, 2); this.ImportBtn.Name = "ImportBtn"; - this.ImportBtn.Size = new System.Drawing.Size(222, 60); + this.ImportBtn.Size = new System.Drawing.Size(111, 33); this.ImportBtn.TabIndex = 5; this.ImportBtn.Text = "全部导入"; this.ImportBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -1644,10 +1631,9 @@ // this.NewBaseBtn.AutoSize = true; this.NewBaseBtn.Image = global::PEIS.Properties.Resources.添加; - this.NewBaseBtn.Location = new System.Drawing.Point(568, 3); - this.NewBaseBtn.Margin = new System.Windows.Forms.Padding(6); + this.NewBaseBtn.Location = new System.Drawing.Point(284, 2); this.NewBaseBtn.Name = "NewBaseBtn"; - this.NewBaseBtn.Size = new System.Drawing.Size(226, 60); + this.NewBaseBtn.Size = new System.Drawing.Size(113, 33); this.NewBaseBtn.TabIndex = 4; this.NewBaseBtn.Text = "新增成员"; this.NewBaseBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -1656,10 +1642,9 @@ // RbFit // this.RbFit.AutoSize = true; - this.RbFit.Location = new System.Drawing.Point(264, 14); - this.RbFit.Margin = new System.Windows.Forms.Padding(6); + this.RbFit.Location = new System.Drawing.Point(132, 8); this.RbFit.Name = "RbFit"; - this.RbFit.Size = new System.Drawing.Size(260, 33); + this.RbFit.Size = new System.Drawing.Size(133, 18); this.RbFit.TabIndex = 3; this.RbFit.TabStop = true; this.RbFit.Text = "符合条件未分组成员"; @@ -1669,10 +1654,9 @@ // this.RbAll.AutoSize = true; this.RbAll.Checked = true; - this.RbAll.Location = new System.Drawing.Point(14, 14); - this.RbAll.Margin = new System.Windows.Forms.Padding(6); + this.RbAll.Location = new System.Drawing.Point(7, 8); this.RbAll.Name = "RbAll"; - this.RbAll.Size = new System.Drawing.Size(212, 33); + this.RbAll.Size = new System.Drawing.Size(109, 18); this.RbAll.TabIndex = 2; this.RbAll.TabStop = true; this.RbAll.Text = "所有未分组成员"; @@ -1682,26 +1666,24 @@ // this.splitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); this.splitter2.Dock = System.Windows.Forms.DockStyle.Top; - this.splitter2.Location = new System.Drawing.Point(0, 335); - this.splitter2.Margin = new System.Windows.Forms.Padding(2); + this.splitter2.Location = new System.Drawing.Point(0, 184); + this.splitter2.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1); this.splitter2.Name = "splitter2"; - this.splitter2.Size = new System.Drawing.Size(2393, 9); + this.splitter2.Size = new System.Drawing.Size(1196, 5); this.splitter2.TabIndex = 132; this.splitter2.TabStop = false; // // DgcGroup // this.DgcGroup.Dock = System.Windows.Forms.DockStyle.Top; - this.DgcGroup.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); - this.DgcGroup.Location = new System.Drawing.Point(0, 76); + this.DgcGroup.Location = new System.Drawing.Point(0, 42); this.DgcGroup.MainView = this.DgvGroup; - this.DgcGroup.Margin = new System.Windows.Forms.Padding(6); this.DgcGroup.Name = "DgcGroup"; this.DgcGroup.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.RiCmbSex, this.RiCmbMarriage, this.RiCmbExamType}); - this.DgcGroup.Size = new System.Drawing.Size(2393, 259); + this.DgcGroup.Size = new System.Drawing.Size(1196, 142); this.DgcGroup.TabIndex = 130; this.DgcGroup.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvGroup}); @@ -1907,18 +1889,17 @@ this.panel3.Controls.Add(this.OpsGroup); this.panel3.Dock = System.Windows.Forms.DockStyle.Top; this.panel3.Location = new System.Drawing.Point(0, 0); - this.panel3.Margin = new System.Windows.Forms.Padding(6); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(2393, 76); + this.panel3.Size = new System.Drawing.Size(1196, 42); this.panel3.TabIndex = 129; // // OpsGroup // this.OpsGroup.Dock = System.Windows.Forms.DockStyle.Fill; this.OpsGroup.Location = new System.Drawing.Point(0, 0); - this.OpsGroup.Margin = new System.Windows.Forms.Padding(6, 9, 6, 9); + this.OpsGroup.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.OpsGroup.Name = "OpsGroup"; - this.OpsGroup.Size = new System.Drawing.Size(2393, 76); + this.OpsGroup.Size = new System.Drawing.Size(1196, 42); this.OpsGroup.TabIndex = 2; // // TpGroupFeeItem @@ -1927,9 +1908,8 @@ this.TpGroupFeeItem.Controls.Add(this.DgcGroup2); this.TpGroupFeeItem.Controls.Add(this.panel4); this.TpGroupFeeItem.Image = global::PEIS.Properties.Resources.收费项目; - this.TpGroupFeeItem.Margin = new System.Windows.Forms.Padding(6); this.TpGroupFeeItem.Name = "TpGroupFeeItem"; - this.TpGroupFeeItem.Size = new System.Drawing.Size(2393, 1702); + this.TpGroupFeeItem.Size = new System.Drawing.Size(1196, 922); this.TpGroupFeeItem.Text = "分组项目"; // // panel5 @@ -1939,23 +1919,21 @@ this.panel5.Controls.Add(this.panel9); this.panel5.Controls.Add(this.splitter8); this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel5.Location = new System.Drawing.Point(0, 351); - this.panel5.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.panel5.Location = new System.Drawing.Point(0, 192); + this.panel5.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(2393, 1351); + this.panel5.Size = new System.Drawing.Size(1196, 730); this.panel5.TabIndex = 139; // // DgcGroupFeeItem // this.DgcGroupFeeItem.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcGroupFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); - this.DgcGroupFeeItem.Location = new System.Drawing.Point(0, 9); + this.DgcGroupFeeItem.Location = new System.Drawing.Point(0, 5); this.DgcGroupFeeItem.MainView = this.DgvGroupFeeItem; - this.DgcGroupFeeItem.Margin = new System.Windows.Forms.Padding(6); this.DgcGroupFeeItem.Name = "DgcGroupFeeItem"; this.DgcGroupFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemMemoEdit1}); - this.DgcGroupFeeItem.Size = new System.Drawing.Size(1466, 1342); + this.DgcGroupFeeItem.Size = new System.Drawing.Size(732, 725); this.DgcGroupFeeItem.TabIndex = 137; this.DgcGroupFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvGroupFeeItem}); @@ -2153,10 +2131,9 @@ // this.splitter4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); this.splitter4.Dock = System.Windows.Forms.DockStyle.Right; - this.splitter4.Location = new System.Drawing.Point(1466, 9); - this.splitter4.Margin = new System.Windows.Forms.Padding(6); + this.splitter4.Location = new System.Drawing.Point(732, 5); this.splitter4.Name = "splitter4"; - this.splitter4.Size = new System.Drawing.Size(8, 1342); + this.splitter4.Size = new System.Drawing.Size(4, 725); this.splitter4.TabIndex = 142; this.splitter4.TabStop = false; // @@ -2164,10 +2141,10 @@ // this.panel9.Controls.Add(this.tabControl1); this.panel9.Dock = System.Windows.Forms.DockStyle.Right; - this.panel9.Location = new System.Drawing.Point(1474, 9); - this.panel9.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.panel9.Location = new System.Drawing.Point(736, 5); + this.panel9.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(919, 1342); + this.panel9.Size = new System.Drawing.Size(460, 725); this.panel9.TabIndex = 141; // // tabControl1 @@ -2176,20 +2153,20 @@ this.tabControl1.Controls.Add(this.TpFeeItem); this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControl1.Location = new System.Drawing.Point(0, 0); - this.tabControl1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabControl1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(919, 1342); + this.tabControl1.Size = new System.Drawing.Size(460, 725); this.tabControl1.TabIndex = 139; // // TpPack // this.TpPack.Controls.Add(this.DgcPack); - this.TpPack.Location = new System.Drawing.Point(8, 43); - this.TpPack.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.TpPack.Location = new System.Drawing.Point(4, 24); + this.TpPack.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.TpPack.Name = "TpPack"; - this.TpPack.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.TpPack.Size = new System.Drawing.Size(903, 1291); + this.TpPack.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.TpPack.Size = new System.Drawing.Size(452, 708); this.TpPack.TabIndex = 1; this.TpPack.Text = "套餐"; this.TpPack.UseVisualStyleBackColor = true; @@ -2197,12 +2174,10 @@ // DgcPack // this.DgcPack.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcPack.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); - this.DgcPack.Location = new System.Drawing.Point(5, 6); + this.DgcPack.Location = new System.Drawing.Point(2, 3); this.DgcPack.MainView = this.DgvPack; - this.DgcPack.Margin = new System.Windows.Forms.Padding(6); this.DgcPack.Name = "DgcPack"; - this.DgcPack.Size = new System.Drawing.Size(893, 1279); + this.DgcPack.Size = new System.Drawing.Size(448, 702); this.DgcPack.TabIndex = 122; this.DgcPack.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvPack, @@ -2363,11 +2338,11 @@ // this.TpFeeItem.Controls.Add(this.DgcFeeItem); this.TpFeeItem.Controls.Add(this.FeeItemSearch); - this.TpFeeItem.Location = new System.Drawing.Point(8, 43); - this.TpFeeItem.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.TpFeeItem.Location = new System.Drawing.Point(4, 24); + this.TpFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.TpFeeItem.Name = "TpFeeItem"; - this.TpFeeItem.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.TpFeeItem.Size = new System.Drawing.Size(903, 1291); + this.TpFeeItem.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.TpFeeItem.Size = new System.Drawing.Size(452, 708); this.TpFeeItem.TabIndex = 0; this.TpFeeItem.Text = "收费项目"; this.TpFeeItem.UseVisualStyleBackColor = true; @@ -2375,14 +2350,12 @@ // DgcFeeItem // this.DgcFeeItem.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); - this.DgcFeeItem.Location = new System.Drawing.Point(5, 42); + this.DgcFeeItem.Location = new System.Drawing.Point(2, 25); this.DgcFeeItem.MainView = this.DgvFeeItem; - this.DgcFeeItem.Margin = new System.Windows.Forms.Padding(6); this.DgcFeeItem.Name = "DgcFeeItem"; this.DgcFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit1}); - this.DgcFeeItem.Size = new System.Drawing.Size(893, 1243); + this.DgcFeeItem.Size = new System.Drawing.Size(448, 680); this.DgcFeeItem.TabIndex = 137; this.DgcFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvFeeItem, @@ -2556,10 +2529,10 @@ // FeeItemSearch // this.FeeItemSearch.Dock = System.Windows.Forms.DockStyle.Top; - this.FeeItemSearch.Location = new System.Drawing.Point(5, 6); - this.FeeItemSearch.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.FeeItemSearch.Location = new System.Drawing.Point(2, 3); + this.FeeItemSearch.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.FeeItemSearch.Name = "FeeItemSearch"; - this.FeeItemSearch.Size = new System.Drawing.Size(893, 36); + this.FeeItemSearch.Size = new System.Drawing.Size(448, 22); this.FeeItemSearch.TabIndex = 136; // // splitter8 @@ -2567,25 +2540,22 @@ this.splitter8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); this.splitter8.Dock = System.Windows.Forms.DockStyle.Top; this.splitter8.Location = new System.Drawing.Point(0, 0); - this.splitter8.Margin = new System.Windows.Forms.Padding(6); this.splitter8.Name = "splitter8"; - this.splitter8.Size = new System.Drawing.Size(2393, 9); + this.splitter8.Size = new System.Drawing.Size(1196, 5); this.splitter8.TabIndex = 140; this.splitter8.TabStop = false; // // DgcGroup2 // this.DgcGroup2.Dock = System.Windows.Forms.DockStyle.Top; - this.DgcGroup2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); - this.DgcGroup2.Location = new System.Drawing.Point(0, 81); + this.DgcGroup2.Location = new System.Drawing.Point(0, 44); this.DgcGroup2.MainView = this.DgvGroup2; - this.DgcGroup2.Margin = new System.Windows.Forms.Padding(6); this.DgcGroup2.Name = "DgcGroup2"; this.DgcGroup2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemComboBox1, this.repositoryItemComboBox2, this.repositoryItemComboBox3}); - this.DgcGroup2.Size = new System.Drawing.Size(2393, 270); + this.DgcGroup2.Size = new System.Drawing.Size(1196, 148); this.DgcGroup2.TabIndex = 142; this.DgcGroup2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvGroup2}); @@ -2812,9 +2782,9 @@ this.panel4.Controls.Add(this.BtnApplyGroupFeeItem); this.panel4.Dock = System.Windows.Forms.DockStyle.Top; this.panel4.Location = new System.Drawing.Point(0, 0); - this.panel4.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.panel4.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(2393, 81); + this.panel4.Size = new System.Drawing.Size(1196, 44); this.panel4.TabIndex = 141; // // BtnApplyGroupFeeItem @@ -2826,10 +2796,9 @@ this.BtnApplyGroupFeeItem.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.BtnApplyGroupFeeItem.Image = global::PEIS.Properties.Resources.添加; this.BtnApplyGroupFeeItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.BtnApplyGroupFeeItem.Location = new System.Drawing.Point(2027, 0); - this.BtnApplyGroupFeeItem.Margin = new System.Windows.Forms.Padding(6); + this.BtnApplyGroupFeeItem.Location = new System.Drawing.Point(1013, 0); this.BtnApplyGroupFeeItem.Name = "BtnApplyGroupFeeItem"; - this.BtnApplyGroupFeeItem.Size = new System.Drawing.Size(366, 81); + this.BtnApplyGroupFeeItem.Size = new System.Drawing.Size(183, 44); this.BtnApplyGroupFeeItem.TabIndex = 34; this.BtnApplyGroupFeeItem.Text = "应用收费模板到团体成员"; this.BtnApplyGroupFeeItem.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -2842,9 +2811,8 @@ this.TpPerson.Controls.Add(this.splitterControl1); this.TpPerson.Controls.Add(this.panel11); this.TpPerson.Image = global::PEIS.Properties.Resources.个人信息__1_; - this.TpPerson.Margin = new System.Windows.Forms.Padding(6); this.TpPerson.Name = "TpPerson"; - this.TpPerson.Size = new System.Drawing.Size(2393, 1702); + this.TpPerson.Size = new System.Drawing.Size(1196, 736); this.TpPerson.Text = "团体成员收费"; // // panel6 @@ -2855,30 +2823,29 @@ this.panel6.Controls.Add(this.splitter5); this.panel6.Controls.Add(this.panel8); this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel6.Location = new System.Drawing.Point(570, 75); - this.panel6.Margin = new System.Windows.Forms.Padding(6); + this.panel6.Location = new System.Drawing.Point(285, 42); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(1823, 1627); + this.panel6.Size = new System.Drawing.Size(911, 694); this.panel6.TabIndex = 147; // // panel13 // this.panel13.Controls.Add(this.xtraTabControl4); this.panel13.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel13.Location = new System.Drawing.Point(1111, 720); - this.panel13.Margin = new System.Windows.Forms.Padding(5); + this.panel13.Location = new System.Drawing.Point(555, 394); + this.panel13.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel13.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(712, 907); + this.panel13.Size = new System.Drawing.Size(356, 300); this.panel13.TabIndex = 155; // // xtraTabControl4 // this.xtraTabControl4.Dock = System.Windows.Forms.DockStyle.Fill; this.xtraTabControl4.Location = new System.Drawing.Point(0, 0); - this.xtraTabControl4.Margin = new System.Windows.Forms.Padding(5); + this.xtraTabControl4.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.xtraTabControl4.Name = "xtraTabControl4"; this.xtraTabControl4.SelectedTabPage = this.xtraTabPage4; - this.xtraTabControl4.Size = new System.Drawing.Size(712, 907); + this.xtraTabControl4.Size = new System.Drawing.Size(356, 300); this.xtraTabControl4.TabIndex = 1; this.xtraTabControl4.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage4}); @@ -2886,23 +2853,21 @@ // xtraTabPage4 // this.xtraTabPage4.Controls.Add(this.DgcCheckCost2); - this.xtraTabPage4.Margin = new System.Windows.Forms.Padding(5); + this.xtraTabPage4.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.xtraTabPage4.Name = "xtraTabPage4"; - this.xtraTabPage4.Size = new System.Drawing.Size(700, 850); + this.xtraTabPage4.Size = new System.Drawing.Size(350, 271); this.xtraTabPage4.Text = "个人订单"; // // DgcCheckCost2 // this.DgcCheckCost2.ContextMenuStrip = this.PersonCostFastMenu; this.DgcCheckCost2.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcCheckCost2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); this.DgcCheckCost2.Location = new System.Drawing.Point(0, 0); this.DgcCheckCost2.MainView = this.DgvCheckCost2; - this.DgcCheckCost2.Margin = new System.Windows.Forms.Padding(6); this.DgcCheckCost2.Name = "DgcCheckCost2"; this.DgcCheckCost2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemMemoEdit2}); - this.DgcCheckCost2.Size = new System.Drawing.Size(700, 850); + this.DgcCheckCost2.Size = new System.Drawing.Size(350, 271); this.DgcCheckCost2.TabIndex = 148; this.DgcCheckCost2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvCheckCost2}); @@ -2920,20 +2885,20 @@ this.toolStripMenuItem15, this.PFastRefreshCost}); this.PersonCostFastMenu.Name = "CostFastMenu"; - this.PersonCostFastMenu.Size = new System.Drawing.Size(245, 292); + this.PersonCostFastMenu.Size = new System.Drawing.Size(161, 276); // // PFastCharge // this.PFastCharge.Image = ((System.Drawing.Image)(resources.GetObject("PFastCharge.Image"))); this.PFastCharge.Name = "PFastCharge"; - this.PFastCharge.Size = new System.Drawing.Size(244, 36); + this.PFastCharge.Size = new System.Drawing.Size(160, 34); this.PFastCharge.Text = "记账"; // // PFastAllCharge // this.PFastAllCharge.Image = ((System.Drawing.Image)(resources.GetObject("PFastAllCharge.Image"))); this.PFastAllCharge.Name = "PFastAllCharge"; - this.PFastAllCharge.Size = new System.Drawing.Size(244, 36); + this.PFastAllCharge.Size = new System.Drawing.Size(160, 34); this.PFastAllCharge.Text = "全部记账"; // // PFastDeleteCost @@ -2941,7 +2906,7 @@ this.PFastDeleteCost.Image = ((System.Drawing.Image)(resources.GetObject("PFastDeleteCost.Image"))); this.PFastDeleteCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PFastDeleteCost.Name = "PFastDeleteCost"; - this.PFastDeleteCost.Size = new System.Drawing.Size(244, 36); + this.PFastDeleteCost.Size = new System.Drawing.Size(160, 34); this.PFastDeleteCost.Text = "删除订单"; // // PFastCancelCharge @@ -2949,7 +2914,7 @@ this.PFastCancelCharge.Image = ((System.Drawing.Image)(resources.GetObject("PFastCancelCharge.Image"))); this.PFastCancelCharge.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PFastCancelCharge.Name = "PFastCancelCharge"; - this.PFastCancelCharge.Size = new System.Drawing.Size(244, 36); + this.PFastCancelCharge.Size = new System.Drawing.Size(160, 34); this.PFastCancelCharge.Text = "取消记账"; // // PFastChangeCost @@ -2957,20 +2922,20 @@ this.PFastChangeCost.Image = global::PEIS.Properties.Resources.刷新; this.PFastChangeCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PFastChangeCost.Name = "PFastChangeCost"; - this.PFastChangeCost.Size = new System.Drawing.Size(244, 36); + this.PFastChangeCost.Size = new System.Drawing.Size(160, 34); this.PFastChangeCost.Text = "订单转换"; // // toolStripMenuItem14 // this.toolStripMenuItem14.Name = "toolStripMenuItem14"; - this.toolStripMenuItem14.Size = new System.Drawing.Size(244, 36); + this.toolStripMenuItem14.Size = new System.Drawing.Size(160, 34); this.toolStripMenuItem14.Text = "全部删除订单"; this.toolStripMenuItem14.Visible = false; // // toolStripMenuItem15 // this.toolStripMenuItem15.Name = "toolStripMenuItem15"; - this.toolStripMenuItem15.Size = new System.Drawing.Size(244, 36); + this.toolStripMenuItem15.Size = new System.Drawing.Size(160, 34); this.toolStripMenuItem15.Text = "全部取消记账"; this.toolStripMenuItem15.Visible = false; // @@ -2979,7 +2944,7 @@ this.PFastRefreshCost.Image = global::PEIS.Properties.Resources.刷新; this.PFastRefreshCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PFastRefreshCost.Name = "PFastRefreshCost"; - this.PFastRefreshCost.Size = new System.Drawing.Size(244, 36); + this.PFastRefreshCost.Size = new System.Drawing.Size(160, 34); this.PFastRefreshCost.Text = "刷新订单"; this.PFastRefreshCost.Visible = false; // @@ -3311,10 +3276,10 @@ // splitter6 // this.splitter6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); - this.splitter6.Location = new System.Drawing.Point(1101, 720); - this.splitter6.Margin = new System.Windows.Forms.Padding(5); + this.splitter6.Location = new System.Drawing.Point(550, 394); + this.splitter6.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.splitter6.Name = "splitter6"; - this.splitter6.Size = new System.Drawing.Size(10, 907); + this.splitter6.Size = new System.Drawing.Size(5, 300); this.splitter6.TabIndex = 154; this.splitter6.TabStop = false; // @@ -3322,20 +3287,20 @@ // this.panel12.Controls.Add(this.xtraTabControl3); this.panel12.Dock = System.Windows.Forms.DockStyle.Left; - this.panel12.Location = new System.Drawing.Point(0, 720); - this.panel12.Margin = new System.Windows.Forms.Padding(5); + this.panel12.Location = new System.Drawing.Point(0, 394); + this.panel12.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(1101, 907); + this.panel12.Size = new System.Drawing.Size(550, 300); this.panel12.TabIndex = 153; // // xtraTabControl3 // this.xtraTabControl3.Dock = System.Windows.Forms.DockStyle.Fill; this.xtraTabControl3.Location = new System.Drawing.Point(0, 0); - this.xtraTabControl3.Margin = new System.Windows.Forms.Padding(5); + this.xtraTabControl3.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.xtraTabControl3.Name = "xtraTabControl3"; this.xtraTabControl3.SelectedTabPage = this.xtraTabPage2; - this.xtraTabControl3.Size = new System.Drawing.Size(1101, 907); + this.xtraTabControl3.Size = new System.Drawing.Size(550, 300); this.xtraTabControl3.TabIndex = 0; this.xtraTabControl3.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage2}); @@ -3343,23 +3308,21 @@ // xtraTabPage2 // this.xtraTabPage2.Controls.Add(this.DgcCheckCost); - this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(5); + this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.xtraTabPage2.Name = "xtraTabPage2"; - this.xtraTabPage2.Size = new System.Drawing.Size(1089, 850); + this.xtraTabPage2.Size = new System.Drawing.Size(544, 271); this.xtraTabPage2.Text = "团体订单"; // // DgcCheckCost // this.DgcCheckCost.ContextMenuStrip = this.TeamCostFastMenu; this.DgcCheckCost.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcCheckCost.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); this.DgcCheckCost.Location = new System.Drawing.Point(0, 0); this.DgcCheckCost.MainView = this.DgvCheckCost; - this.DgcCheckCost.Margin = new System.Windows.Forms.Padding(6); this.DgcCheckCost.Name = "DgcCheckCost"; this.DgcCheckCost.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemMemoEdit3}); - this.DgcCheckCost.Size = new System.Drawing.Size(1089, 850); + this.DgcCheckCost.Size = new System.Drawing.Size(544, 271); this.DgcCheckCost.TabIndex = 147; this.DgcCheckCost.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvCheckCost}); @@ -3376,20 +3339,20 @@ this.TFastAllDeleteCost, this.TFastAllCancelCharge}); this.TeamCostFastMenu.Name = "CostFastMenu"; - this.TeamCostFastMenu.Size = new System.Drawing.Size(245, 256); + this.TeamCostFastMenu.Size = new System.Drawing.Size(161, 242); // // TFastCharge // this.TFastCharge.Image = ((System.Drawing.Image)(resources.GetObject("TFastCharge.Image"))); this.TFastCharge.Name = "TFastCharge"; - this.TFastCharge.Size = new System.Drawing.Size(244, 36); + this.TFastCharge.Size = new System.Drawing.Size(160, 34); this.TFastCharge.Text = "记账"; // // TFastAllCharge // this.TFastAllCharge.Image = ((System.Drawing.Image)(resources.GetObject("TFastAllCharge.Image"))); this.TFastAllCharge.Name = "TFastAllCharge"; - this.TFastAllCharge.Size = new System.Drawing.Size(244, 36); + this.TFastAllCharge.Size = new System.Drawing.Size(160, 34); this.TFastAllCharge.Text = "全部记账"; // // TFastDeleteCost @@ -3397,7 +3360,7 @@ this.TFastDeleteCost.Image = ((System.Drawing.Image)(resources.GetObject("TFastDeleteCost.Image"))); this.TFastDeleteCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TFastDeleteCost.Name = "TFastDeleteCost"; - this.TFastDeleteCost.Size = new System.Drawing.Size(244, 36); + this.TFastDeleteCost.Size = new System.Drawing.Size(160, 34); this.TFastDeleteCost.Text = "删除订单"; // // TFastCancelCharge @@ -3405,7 +3368,7 @@ this.TFastCancelCharge.Image = ((System.Drawing.Image)(resources.GetObject("TFastCancelCharge.Image"))); this.TFastCancelCharge.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TFastCancelCharge.Name = "TFastCancelCharge"; - this.TFastCancelCharge.Size = new System.Drawing.Size(244, 36); + this.TFastCancelCharge.Size = new System.Drawing.Size(160, 34); this.TFastCancelCharge.Text = "取消记账"; // // TFastChangeCost @@ -3413,20 +3376,20 @@ this.TFastChangeCost.Image = global::PEIS.Properties.Resources.刷新; this.TFastChangeCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TFastChangeCost.Name = "TFastChangeCost"; - this.TFastChangeCost.Size = new System.Drawing.Size(244, 36); + this.TFastChangeCost.Size = new System.Drawing.Size(160, 34); this.TFastChangeCost.Text = "订单转换"; // // TFastAllDeleteCost // this.TFastAllDeleteCost.Name = "TFastAllDeleteCost"; - this.TFastAllDeleteCost.Size = new System.Drawing.Size(244, 36); + this.TFastAllDeleteCost.Size = new System.Drawing.Size(160, 34); this.TFastAllDeleteCost.Text = "全部删除订单"; this.TFastAllDeleteCost.Visible = false; // // TFastAllCancelCharge // this.TFastAllCancelCharge.Name = "TFastAllCancelCharge"; - this.TFastAllCancelCharge.Size = new System.Drawing.Size(244, 36); + this.TFastAllCancelCharge.Size = new System.Drawing.Size(160, 34); this.TFastAllCancelCharge.Text = "全部取消记账"; this.TFastAllCancelCharge.Visible = false; // @@ -3777,10 +3740,10 @@ // this.splitter5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); this.splitter5.Dock = System.Windows.Forms.DockStyle.Top; - this.splitter5.Location = new System.Drawing.Point(0, 710); - this.splitter5.Margin = new System.Windows.Forms.Padding(5); + this.splitter5.Location = new System.Drawing.Point(0, 389); + this.splitter5.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.splitter5.Name = "splitter5"; - this.splitter5.Size = new System.Drawing.Size(1823, 10); + this.splitter5.Size = new System.Drawing.Size(911, 5); this.splitter5.TabIndex = 152; this.splitter5.TabStop = false; // @@ -3791,20 +3754,20 @@ this.panel8.Controls.Add(this.PnlFeeItem); this.panel8.Dock = System.Windows.Forms.DockStyle.Top; this.panel8.Location = new System.Drawing.Point(0, 0); - this.panel8.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.panel8.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(1823, 710); + this.panel8.Size = new System.Drawing.Size(911, 389); this.panel8.TabIndex = 151; // // DgcEnrollmentFeeItem // this.DgcEnrollmentFeeItem.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcEnrollmentFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.DgcEnrollmentFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.DgcEnrollmentFeeItem.Location = new System.Drawing.Point(0, 0); this.DgcEnrollmentFeeItem.MainView = this.DgvEnrollmentFeeItem; - this.DgcEnrollmentFeeItem.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.DgcEnrollmentFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.DgcEnrollmentFeeItem.Name = "DgcEnrollmentFeeItem"; - this.DgcEnrollmentFeeItem.Size = new System.Drawing.Size(1052, 710); + this.DgcEnrollmentFeeItem.Size = new System.Drawing.Size(526, 389); this.DgcEnrollmentFeeItem.TabIndex = 150; this.DgcEnrollmentFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvEnrollmentFeeItem}); @@ -4022,10 +3985,10 @@ // this.splitter7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); this.splitter7.Dock = System.Windows.Forms.DockStyle.Right; - this.splitter7.Location = new System.Drawing.Point(1052, 0); - this.splitter7.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.splitter7.Location = new System.Drawing.Point(526, 0); + this.splitter7.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.splitter7.Name = "splitter7"; - this.splitter7.Size = new System.Drawing.Size(10, 710); + this.splitter7.Size = new System.Drawing.Size(5, 389); this.splitter7.TabIndex = 149; this.splitter7.TabStop = false; this.splitter7.Visible = false; @@ -4034,10 +3997,10 @@ // this.PnlFeeItem.Controls.Add(this.tabControl2); this.PnlFeeItem.Dock = System.Windows.Forms.DockStyle.Right; - this.PnlFeeItem.Location = new System.Drawing.Point(1062, 0); - this.PnlFeeItem.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.PnlFeeItem.Location = new System.Drawing.Point(531, 0); + this.PnlFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.PnlFeeItem.Name = "PnlFeeItem"; - this.PnlFeeItem.Size = new System.Drawing.Size(761, 710); + this.PnlFeeItem.Size = new System.Drawing.Size(380, 389); this.PnlFeeItem.TabIndex = 147; this.PnlFeeItem.Visible = false; // @@ -4047,20 +4010,20 @@ this.tabControl2.Controls.Add(this.tabPage2); this.tabControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControl2.Location = new System.Drawing.Point(0, 0); - this.tabControl2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabControl2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabControl2.Name = "tabControl2"; this.tabControl2.SelectedIndex = 0; - this.tabControl2.Size = new System.Drawing.Size(761, 710); + this.tabControl2.Size = new System.Drawing.Size(380, 389); this.tabControl2.TabIndex = 139; // // tabPage1 // this.tabPage1.Controls.Add(this.DgcPack2); - this.tabPage1.Location = new System.Drawing.Point(8, 43); - this.tabPage1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabPage1.Location = new System.Drawing.Point(4, 23); + this.tabPage1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabPage1.Size = new System.Drawing.Size(745, 659); + this.tabPage1.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabPage1.Size = new System.Drawing.Size(372, 362); this.tabPage1.TabIndex = 1; this.tabPage1.Text = "套餐"; this.tabPage1.UseVisualStyleBackColor = true; @@ -4068,12 +4031,10 @@ // DgcPack2 // this.DgcPack2.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcPack2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); - this.DgcPack2.Location = new System.Drawing.Point(5, 6); + this.DgcPack2.Location = new System.Drawing.Point(2, 3); this.DgcPack2.MainView = this.DgvPack2; - this.DgcPack2.Margin = new System.Windows.Forms.Padding(6); this.DgcPack2.Name = "DgcPack2"; - this.DgcPack2.Size = new System.Drawing.Size(735, 647); + this.DgcPack2.Size = new System.Drawing.Size(368, 356); this.DgcPack2.TabIndex = 122; this.DgcPack2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvPack2, @@ -4235,11 +4196,11 @@ // this.tabPage2.Controls.Add(this.DgcFeeItem2); this.tabPage2.Controls.Add(this.FeeItemSearch2); - this.tabPage2.Location = new System.Drawing.Point(8, 43); - this.tabPage2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.tabPage2.Location = new System.Drawing.Point(4, 23); + this.tabPage2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.tabPage2.Size = new System.Drawing.Size(745, 659); + this.tabPage2.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tabPage2.Size = new System.Drawing.Size(372, 362); this.tabPage2.TabIndex = 0; this.tabPage2.Text = "收费项目"; this.tabPage2.UseVisualStyleBackColor = true; @@ -4247,14 +4208,12 @@ // DgcFeeItem2 // this.DgcFeeItem2.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcFeeItem2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); - this.DgcFeeItem2.Location = new System.Drawing.Point(5, 42); + this.DgcFeeItem2.Location = new System.Drawing.Point(2, 25); this.DgcFeeItem2.MainView = this.DgvFeeItem2; - this.DgcFeeItem2.Margin = new System.Windows.Forms.Padding(6); this.DgcFeeItem2.Name = "DgcFeeItem2"; this.DgcFeeItem2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit2}); - this.DgcFeeItem2.Size = new System.Drawing.Size(735, 611); + this.DgcFeeItem2.Size = new System.Drawing.Size(368, 334); this.DgcFeeItem2.TabIndex = 138; this.DgcFeeItem2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvFeeItem2, @@ -4432,10 +4391,10 @@ // FeeItemSearch2 // this.FeeItemSearch2.Dock = System.Windows.Forms.DockStyle.Top; - this.FeeItemSearch2.Location = new System.Drawing.Point(5, 6); - this.FeeItemSearch2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.FeeItemSearch2.Location = new System.Drawing.Point(2, 3); + this.FeeItemSearch2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.FeeItemSearch2.Name = "FeeItemSearch2"; - this.FeeItemSearch2.Size = new System.Drawing.Size(735, 36); + this.FeeItemSearch2.Size = new System.Drawing.Size(368, 22); this.FeeItemSearch2.TabIndex = 137; // // panel7 @@ -4443,10 +4402,10 @@ this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel7.Controls.Add(this.menuStrip1); this.panel7.Dock = System.Windows.Forms.DockStyle.Top; - this.panel7.Location = new System.Drawing.Point(570, 0); - this.panel7.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.panel7.Location = new System.Drawing.Point(285, 0); + this.panel7.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(1823, 75); + this.panel7.Size = new System.Drawing.Size(911, 42); this.panel7.TabIndex = 146; // // menuStrip1 @@ -4474,8 +4433,8 @@ this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Padding = new System.Windows.Forms.Padding(5, 3, 0, 3); - this.menuStrip1.Size = new System.Drawing.Size(1382, 46); + this.menuStrip1.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2); + this.menuStrip1.Size = new System.Drawing.Size(893, 44); this.menuStrip1.TabIndex = 129; this.menuStrip1.Text = "menuStrip1"; // @@ -4484,7 +4443,7 @@ this.TsmiCheckOrg.Image = ((System.Drawing.Image)(resources.GetObject("TsmiCheckOrg.Image"))); this.TsmiCheckOrg.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiCheckOrg.Name = "TsmiCheckOrg"; - this.TsmiCheckOrg.Size = new System.Drawing.Size(198, 40); + this.TsmiCheckOrg.Size = new System.Drawing.Size(120, 40); this.TsmiCheckOrg.Text = "生成团体订单"; // // toolStripMenuItem1 @@ -4497,7 +4456,7 @@ this.TsmiCheckPerson.Image = ((System.Drawing.Image)(resources.GetObject("TsmiCheckPerson.Image"))); this.TsmiCheckPerson.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiCheckPerson.Name = "TsmiCheckPerson"; - this.TsmiCheckPerson.Size = new System.Drawing.Size(200, 40); + this.TsmiCheckPerson.Size = new System.Drawing.Size(122, 40); this.TsmiCheckPerson.Text = "生成个人订单"; // // toolStripMenuItem7 @@ -4514,28 +4473,28 @@ this.TsmiPrintCost.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintCost.Image"))); this.TsmiPrintCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiPrintCost.Name = "TsmiPrintCost"; - this.TsmiPrintCost.Size = new System.Drawing.Size(182, 40); + this.TsmiPrintCost.Size = new System.Drawing.Size(116, 40); this.TsmiPrintCost.Text = "打印收费单"; // // TsmiPrintPerson // this.TsmiPrintPerson.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintPerson.Image"))); this.TsmiPrintPerson.Name = "TsmiPrintPerson"; - this.TsmiPrintPerson.Size = new System.Drawing.Size(328, 38); + this.TsmiPrintPerson.Size = new System.Drawing.Size(188, 26); this.TsmiPrintPerson.Text = "打印个人收费单"; // // TsmiPrintTeam // this.TsmiPrintTeam.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintTeam.Image"))); this.TsmiPrintTeam.Name = "TsmiPrintTeam"; - this.TsmiPrintTeam.Size = new System.Drawing.Size(328, 38); + this.TsmiPrintTeam.Size = new System.Drawing.Size(188, 26); this.TsmiPrintTeam.Text = "打印团体收费单"; // // TsmiPrintGroup // this.TsmiPrintGroup.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintGroup.Image"))); this.TsmiPrintGroup.Name = "TsmiPrintGroup"; - this.TsmiPrintGroup.Size = new System.Drawing.Size(328, 38); + this.TsmiPrintGroup.Size = new System.Drawing.Size(188, 26); this.TsmiPrintGroup.Text = "打印团体分组收费单"; // // toolStripMenuItem3 @@ -4549,7 +4508,7 @@ this.TsmiFee.Image = ((System.Drawing.Image)(resources.GetObject("TsmiFee.Image"))); this.TsmiFee.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiFee.Name = "TsmiFee"; - this.TsmiFee.Size = new System.Drawing.Size(110, 40); + this.TsmiFee.Size = new System.Drawing.Size(80, 40); this.TsmiFee.Text = "记账"; this.TsmiFee.Visible = false; // @@ -4563,7 +4522,7 @@ this.TsmiSend.Image = ((System.Drawing.Image)(resources.GetObject("TsmiSend.Image"))); this.TsmiSend.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiSend.Name = "TsmiSend"; - this.TsmiSend.Size = new System.Drawing.Size(178, 40); + this.TsmiSend.Size = new System.Drawing.Size(112, 40); this.TsmiSend.Text = "发送到科室"; // // toolStripMenuItem4 @@ -4576,7 +4535,7 @@ this.TsmiPrintGuide.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintGuide.Image"))); this.TsmiPrintGuide.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiPrintGuide.Name = "TsmiPrintGuide"; - this.TsmiPrintGuide.Size = new System.Drawing.Size(182, 40); + this.TsmiPrintGuide.Size = new System.Drawing.Size(116, 40); this.TsmiPrintGuide.Text = "打印导检单"; // // toolStripMenuItem5 @@ -4589,7 +4548,7 @@ this.TsmiOpenFeeItem.Image = ((System.Drawing.Image)(resources.GetObject("TsmiOpenFeeItem.Image"))); this.TsmiOpenFeeItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiOpenFeeItem.Name = "TsmiOpenFeeItem"; - this.TsmiOpenFeeItem.Size = new System.Drawing.Size(198, 40); + this.TsmiOpenFeeItem.Size = new System.Drawing.Size(120, 40); this.TsmiOpenFeeItem.Text = "打开收费项目"; // // toolStripMenuItem6 @@ -4602,17 +4561,17 @@ this.TsmiBatchCtrl.Image = ((System.Drawing.Image)(resources.GetObject("TsmiBatchCtrl.Image"))); this.TsmiBatchCtrl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiBatchCtrl.Name = "TsmiBatchCtrl"; - this.TsmiBatchCtrl.Size = new System.Drawing.Size(158, 40); + this.TsmiBatchCtrl.Size = new System.Drawing.Size(104, 40); this.TsmiBatchCtrl.Text = "批量操作"; // // splitterControl1 // this.splitterControl1.Appearance.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); this.splitterControl1.Appearance.Options.UseBackColor = true; - this.splitterControl1.Location = new System.Drawing.Point(560, 0); - this.splitterControl1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.splitterControl1.Location = new System.Drawing.Point(280, 0); + this.splitterControl1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.splitterControl1.Name = "splitterControl1"; - this.splitterControl1.Size = new System.Drawing.Size(10, 1702); + this.splitterControl1.Size = new System.Drawing.Size(5, 736); this.splitterControl1.TabIndex = 145; this.splitterControl1.TabStop = false; // @@ -4622,23 +4581,21 @@ this.panel11.Controls.Add(this.PatientSearch); this.panel11.Dock = System.Windows.Forms.DockStyle.Left; this.panel11.Location = new System.Drawing.Point(0, 0); - this.panel11.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.panel11.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel11.Name = "panel11"; - this.panel11.Size = new System.Drawing.Size(560, 1702); + this.panel11.Size = new System.Drawing.Size(280, 736); this.panel11.TabIndex = 144; // // DgcEnrollment // this.DgcEnrollment.ContextMenuStrip = this.InfoFastMenu; this.DgcEnrollment.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcEnrollment.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); - this.DgcEnrollment.Location = new System.Drawing.Point(0, 39); + this.DgcEnrollment.Location = new System.Drawing.Point(0, 23); this.DgcEnrollment.MainView = this.DgvEnrollment; - this.DgcEnrollment.Margin = new System.Windows.Forms.Padding(6); this.DgcEnrollment.Name = "DgcEnrollment"; this.DgcEnrollment.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit3}); - this.DgcEnrollment.Size = new System.Drawing.Size(560, 1663); + this.DgcEnrollment.Size = new System.Drawing.Size(280, 713); this.DgcEnrollment.TabIndex = 133; this.DgcEnrollment.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvEnrollment}); @@ -4655,14 +4612,14 @@ this.FastGroup, this.FastCancelGroup}); this.InfoFastMenu.Name = "CostFastMenu"; - this.InfoFastMenu.Size = new System.Drawing.Size(337, 300); + this.InfoFastMenu.Size = new System.Drawing.Size(205, 214); // // FastCamera // this.FastCamera.Image = ((System.Drawing.Image)(resources.GetObject("FastCamera.Image"))); this.FastCamera.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastCamera.Name = "FastCamera"; - this.FastCamera.Size = new System.Drawing.Size(336, 36); + this.FastCamera.Size = new System.Drawing.Size(204, 30); this.FastCamera.Text = "拍照"; // // FastDelete @@ -4670,41 +4627,41 @@ this.FastDelete.Image = ((System.Drawing.Image)(resources.GetObject("FastDelete.Image"))); this.FastDelete.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastDelete.Name = "FastDelete"; - this.FastDelete.Size = new System.Drawing.Size(336, 36); + this.FastDelete.Size = new System.Drawing.Size(204, 30); this.FastDelete.Text = "删除成员"; // // FastExport // this.FastExport.Image = global::PEIS.Properties.Resources.Excel; this.FastExport.Name = "FastExport"; - this.FastExport.Size = new System.Drawing.Size(336, 36); + this.FastExport.Size = new System.Drawing.Size(204, 30); this.FastExport.Text = "导出所有成员"; // // FastExportTime // this.FastExportTime.Image = global::PEIS.Properties.Resources.Excel; this.FastExportTime.Name = "FastExportTime"; - this.FastExportTime.Size = new System.Drawing.Size(336, 36); + this.FastExportTime.Size = new System.Drawing.Size(204, 30); this.FastExportTime.Text = "导出指定时间范围成员"; // // FastRecall // this.FastRecall.Image = global::PEIS.Properties.Resources.取消弃检; this.FastRecall.Name = "FastRecall"; - this.FastRecall.Size = new System.Drawing.Size(336, 36); + this.FastRecall.Size = new System.Drawing.Size(204, 30); this.FastRecall.Text = "撤回发送"; // // FastGroup // this.FastGroup.Name = "FastGroup"; - this.FastGroup.Size = new System.Drawing.Size(336, 36); + this.FastGroup.Size = new System.Drawing.Size(204, 30); this.FastGroup.Text = "组合缴费"; this.FastGroup.Visible = false; // // FastCancelGroup // this.FastCancelGroup.Name = "FastCancelGroup"; - this.FastCancelGroup.Size = new System.Drawing.Size(336, 36); + this.FastCancelGroup.Size = new System.Drawing.Size(204, 30); this.FastCancelGroup.Text = "取消组合缴费"; this.FastCancelGroup.Visible = false; // @@ -4716,6 +4673,8 @@ this.DgvEnrollment.Appearance.FooterPanel.Options.UseForeColor = true; this.DgvEnrollment.Appearance.GroupRow.Font = new System.Drawing.Font("微软雅黑", 10.5F); this.DgvEnrollment.Appearance.GroupRow.Options.UseFont = true; + this.DgvEnrollment.Appearance.HeaderPanel.Font = new System.Drawing.Font("微软雅黑", 12F); + this.DgvEnrollment.Appearance.HeaderPanel.Options.UseFont = true; this.DgvEnrollment.Appearance.Row.Font = new System.Drawing.Font("微软雅黑", 9F); this.DgvEnrollment.Appearance.Row.Options.UseFont = true; this.DgvEnrollment.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { @@ -4730,6 +4689,7 @@ this.gridColumn94, this.gridColumn95, this.gridColumn96, + this.gridColumn105, this.gridColumn104, this.gridColumn92}); this.DgvEnrollment.GridControl = this.DgcEnrollment; @@ -4986,7 +4946,7 @@ this.gridColumn104.OptionsColumn.ReadOnly = true; this.gridColumn104.OptionsFilter.AllowFilter = false; this.gridColumn104.Visible = true; - this.gridColumn104.VisibleIndex = 11; + this.gridColumn104.VisibleIndex = 12; // // gridColumn92 // @@ -5011,9 +4971,9 @@ this.PatientSearch.Dock = System.Windows.Forms.DockStyle.Top; this.PatientSearch.Font = new System.Drawing.Font("微软雅黑", 9F); this.PatientSearch.Location = new System.Drawing.Point(0, 0); - this.PatientSearch.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.PatientSearch.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.PatientSearch.Name = "PatientSearch"; - this.PatientSearch.Size = new System.Drawing.Size(560, 39); + this.PatientSearch.Size = new System.Drawing.Size(280, 23); this.PatientSearch.TabIndex = 134; // // gridColumn109 @@ -5224,16 +5184,33 @@ // this.gridView8.Name = "gridView8"; // + // gridColumn105 + // + this.gridColumn105.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn105.AppearanceCell.Options.UseFont = true; + this.gridColumn105.Caption = "联系方式"; + this.gridColumn105.FieldName = "Tel1"; + this.gridColumn105.Name = "gridColumn105"; + this.gridColumn105.OptionsColumn.AllowEdit = false; + this.gridColumn105.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn105.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn105.OptionsColumn.AllowMove = false; + this.gridColumn105.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn105.OptionsColumn.ReadOnly = true; + this.gridColumn105.OptionsFilter.AllowFilter = false; + this.gridColumn105.Visible = true; + this.gridColumn105.VisibleIndex = 11; + // // EnrollmentOrgForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(2884, 1759); + this.ClientSize = new System.Drawing.Size(1442, 779); this.Controls.Add(this.TcOrg); this.Controls.Add(this.splitter1); this.Controls.Add(this.panel1); - this.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "EnrollmentOrgForm"; this.Text = "团体登记"; ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).EndInit(); @@ -5689,5 +5666,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn102; private System.Windows.Forms.ToolStripMenuItem FastExportTime; private DevExpress.XtraGrid.Columns.GridColumn gridColumn104; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn105; } } \ No newline at end of file diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.resx b/PEIS/View/Enrollment/EnrollmentOrgForm.resx index 098ea78..debec70 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.resx +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.resx @@ -454,7 +454,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU 0iiDPCGiE3ZCRkvR8VzTeBhnyR5/ccaZNnPhB4t9sdf6Ln5hb8QeathNJFVFKF5C8DqL4ksDVHWGDf7j LHyPg6NjviSaFqlu5yQYR+KpupaIkrMknCxT3Y7v/NYYb0ITK1c3BarbWWhLQ7IR0cTKReyZ6lZ0XYei ztHpK4bAc+h1FgQijzSxMptrGIxVSO0xX3AaStFki7bUMVFmaMm/eJMGfIH/MkGzLep0AXn4h/r3CJV3 @@ -465,7 +465,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4 4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl @@ -481,7 +481,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3 8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ 1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH @@ -497,7 +497,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0 jGlByTSyJTXJwq2oKZQb1KAv6JCYWSxvBrkkZUq4CeQEiRABFeLL072Xa0zRra31bO8v57zP5znnPYf1 X+TxhWF6O7VtGYcnwbSWijKPOLzYrPSvLPwLS3huGUMlT7o9wGD9grVUBj+icdid03S9tDmgNxNwTgVQ J+rA8XNtWwM+uuZATMwxmQVRycuJFNyzIRitDlScugKzjSgFRGJJaIwEsrk8AsHIhnSL/Ssck37UNipQ @@ -512,7 +512,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAGCSURBVDhPnZK9S0JRGMb9F1xb2gqaq6mhwCGDtvYIIyLI + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGCSURBVDhPnZK9S0JRGMb9F1xb2gqaq6mhwCGDtvYIIyLI cJOE1paoIYpMKUjFRDH87lpoakGlIZF9DA2hZJEQhJXl1xPn3HPV29WQfvBwOfA+P95zuDJ39A6/4wyl YOOSMHvOcHGThuwvSKEVRvsR+pQqWD3R1pK98DUbl7Jm5hA8SfESd6S5xH5wycalrO4E0D8yWQuriLH6 E2xcSqlcoRJBxCpiTO5TNi4m/ZgDF4nDsOulsfujyGRzUsmWM8YqdcggKbveS3A88bEkslRye58RSzZt @@ -525,7 +525,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi LaVsERnRF5iCaSZJO1toCDVGFkgoFpWQWWRR2aIvUxm1BKN1wSnHCFw4TOCzue+9nPNw4eVVnav4Izzb QfxeGZ5TWaxT/rK3irzmC7CsusvC1G4IkbNLboIiDieF4GGUKeTeClDpppF8eeEu2PIfwfrzizSdw3Hk EnKlFpkMzV2wH77AosOFTV8A+vkl9CiHuJeLJNNZjM8tYWB0FkTvMAwmy/8ERTR6CwjlGAi1Ccence6C @@ -538,7 +538,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH Xe1Cr7qKDIMkZixwNhfWLGWbnuki0kXKzLU023KubBNPJrbRdOzocm6e2dPOO21mMS+CHvjcvOf9PF++ 79H9M+7RT2iRRsIi9sEAXe43yAvf2LpSHq28G9uAnytNT4jMLewtcQ2Ht2pF8ps/aOt+gccX5lxD694S +1BQFD1RkN5DSFa4Z3uONKbgHE3h8KZ4OJTC1J8UiSzmfhd2uf1CoJHbyKOsZokl0kKwm+aeJaov+wjO @@ -552,7 +552,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh FqYZRmJG1iKmUqKyLB2pqSm6vC1Nm5GXoeatEsVJ0RASR3eNzegikRq5lrV3857Fr/d9ddlICoL+8OfA Oef/e57zcIT/os7WLMw302muSGJ2689qqi7A44q8IzjtNYzarzHQm8tZtT8FmRqu6LToMxN+B8qhCbGR KVcDE85ajKUaxoaryEuL4UVXIudPB5Ko2oy98xjDptXERuz3hsgAOTzlqqMk6yjdllzE90UM9Wp5azlB