From 58b2c11d7375124fd14ecc40e3b71358205add35 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E401PHE\\Administrator" Date: Tue, 27 May 2025 09:08:33 +0800 Subject: [PATCH] 1 --- .../U_JYOrderCDList.dfm | 16 +++--- .../U_JYOrderCDList.pas | 16 +++++- .../U_MarkingInspection.dfm | 54 +++++++++---------- 3 files changed, 49 insertions(+), 37 deletions(-) diff --git a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm index 5086e98..e0909f8 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm +++ b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.dfm @@ -19,7 +19,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList object ToolBar1: TToolBar Left = 0 Top = 0 - Width = 1341 + Width = 1349 Height = 62 AutoSize = True ButtonHeight = 30 @@ -136,7 +136,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList object Panel1: TPanel Left = 0 Top = 62 - Width = 1341 + Width = 1349 Height = 81 Align = alTop BevelInner = bvRaised @@ -586,8 +586,8 @@ object frmJYOrderCDList: TfrmJYOrderCDList object cxGrid1: TcxGrid Left = 0 Top = 196 - Width = 1341 - Height = 486 + Width = 1349 + Height = 494 Align = alClient PopupMenu = PopupMenu1 TabOrder = 4 @@ -1084,14 +1084,14 @@ object frmJYOrderCDList: TfrmJYOrderCDList object Panel6: TPanel Left = 0 Top = 143 - Width = 1341 + Width = 1349 Height = 28 Align = alTop AutoSize = True BorderStyle = bsSingle TabOrder = 2 DesignSize = ( - 1337 + 1345 24) object Label31: TLabel Left = 25 @@ -1185,7 +1185,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList object cxTabControl1: TcxTabControl Left = 0 Top = 171 - Width = 1341 + Width = 1349 Height = 25 Align = alTop Font.Charset = GB2312_CHARSET @@ -1204,7 +1204,7 @@ object frmJYOrderCDList: TfrmJYOrderCDList #20840#37096) OnChange = cxTabControl1Change ClientRectBottom = 27 - ClientRectRight = 1341 + ClientRectRight = 1349 ClientRectTop = 27 end object cxGridPopupMenu1: TcxGridPopupMenu diff --git a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas index 037200a..b4cd58f 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas +++ b/染整计划(DyeingFinishingPlan.dll)/U_JYOrderCDList.pas @@ -12,7 +12,21 @@ uses RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit, cxContainer, cxCurrencyEdit, BtnEdit, RM_e_main, RM_e_htm, RM_e_Graphic, RM_e_Jpeg, RM_e_txt, RM_e_csv, RM_E_llPDF, Math, Clipbrd, cxPC, cxLookAndFeels, - cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu; + cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxSkinsCore, + dxSkinBlack, dxSkinBlue, dxSkinBlueprint, dxSkinCaramel, dxSkinCoffee, + dxSkinDarkRoom, dxSkinDarkSide, dxSkinDevExpressDarkStyle, + dxSkinDevExpressStyle, dxSkinFoggy, dxSkinGlassOceans, + dxSkinHighContrast, dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, + dxSkinLondonLiquidSky, dxSkinMcSkin, dxSkinMetropolis, + dxSkinMetropolisDark, dxSkinMoneyTwins, dxSkinOffice2007Black, + dxSkinOffice2007Blue, dxSkinOffice2007Green, dxSkinOffice2007Pink, + dxSkinOffice2007Silver, dxSkinOffice2010Black, dxSkinOffice2010Blue, + dxSkinOffice2010Silver, dxSkinOffice2013DarkGray, + dxSkinOffice2013LightGray, dxSkinOffice2013White, dxSkinPumpkin, + dxSkinSeven, dxSkinSevenClassic, dxSkinSharp, dxSkinSharpPlus, + dxSkinSilver, dxSkinSpringTime, dxSkinStardust, dxSkinSummer2008, + dxSkinTheAsphaltWorld, dxSkinsDefaultPainters, dxSkinValentine, + dxSkinVS2010, dxSkinWhiteprint, dxSkinXmas2008Blue, dxSkinscxPCPainter; type TfrmJYOrderCDList = class(TForm) diff --git a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm index 5971bab..ca36814 100644 --- a/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm +++ b/染整计划(DyeingFinishingPlan.dll)/U_MarkingInspection.dfm @@ -18,10 +18,10 @@ object frmMarkingInspection: TfrmMarkingInspection PixelsPerInch = 96 TextHeight = 12 object ScrollBox1: TScrollBox - Left = 785 + Left = 794 Top = 85 Width = 241 - Height = 592 + Height = 600 Align = alLeft TabOrder = 1 object SpeedButton13: TSpeedButton @@ -477,8 +477,8 @@ object frmMarkingInspection: TfrmMarkingInspection object Panel2: TPanel Left = 0 Top = 85 - Width = 360 - Height = 592 + Width = 369 + Height = 600 Align = alLeft BevelInner = bvRaised BevelOuter = bvLowered @@ -656,8 +656,8 @@ object frmMarkingInspection: TfrmMarkingInspection ParentFont = False end object Label37: TLabel - Left = 435 - Top = 434 + Left = 203 + Top = 282 Width = 40 Height = 23 Caption = #32568#21495 @@ -667,7 +667,6 @@ object frmMarkingInspection: TfrmMarkingInspection Font.Name = 'Arial' Font.Style = [] ParentFont = False - Visible = False end object Label38: TLabel Left = 11 @@ -902,8 +901,8 @@ object frmMarkingInspection: TfrmMarkingInspection '4') end object MJStr4: TEdit - Left = 479 - Top = 425 + Left = 247 + Top = 273 Width = 102 Height = 41 Font.Charset = GB2312_CHARSET @@ -913,7 +912,6 @@ object frmMarkingInspection: TfrmMarkingInspection Font.Style = [] ParentFont = False TabOrder = 1 - Visible = False OnClick = Edit1Click OnKeyPress = MJstr3KeyPress end @@ -1046,10 +1044,10 @@ object frmMarkingInspection: TfrmMarkingInspection end end object Panel7: TPanel - Left = 1026 + Left = 1035 Top = 85 Width = 0 - Height = 592 + Height = 600 Align = alClient BevelInner = bvRaised BevelOuter = bvLowered @@ -1057,8 +1055,8 @@ object frmMarkingInspection: TfrmMarkingInspection object cxGrid2: TcxGrid Left = 2 Top = 2 - Width = 336 - Height = 263 + Width = 524 + Height = 271 Align = alClient TabOrder = 0 object Tv2: TcxGridDBTableView @@ -1150,8 +1148,8 @@ object frmMarkingInspection: TfrmMarkingInspection end object Panel8: TPanel Left = 2 - Top = 265 - Width = 336 + Top = 273 + Width = 524 Height = 41 Align = alBottom Caption = 'A<=25 2533' @@ -1166,8 +1164,8 @@ object frmMarkingInspection: TfrmMarkingInspection end object AOrdDefNote1: TRichEdit Left = 2 - Top = 306 - Width = 336 + Top = 314 + Width = 524 Height = 284 Align = alBottom Font.Charset = GB2312_CHARSET @@ -1183,14 +1181,14 @@ object frmMarkingInspection: TfrmMarkingInspection object Panel5: TPanel Left = 0 Top = 0 - Width = 1026 + Width = 1035 Height = 85 Align = alTop TabOrder = 0 object Panel6: TPanel Left = 1 Top = 31 - Width = 1024 + Width = 1033 Height = 53 Align = alClient BevelInner = bvRaised @@ -1368,7 +1366,7 @@ object frmMarkingInspection: TfrmMarkingInspection object ToolBar1: TToolBar Left = 1 Top = 1 - Width = 1024 + Width = 1033 Height = 30 ButtonHeight = 30 ButtonWidth = 119 @@ -1439,18 +1437,18 @@ object frmMarkingInspection: TfrmMarkingInspection end end object cxSplitter1: TcxSplitter - Left = 777 + Left = 786 Top = 85 Width = 8 - Height = 592 + Height = 600 HotZoneClassName = 'TcxMediaPlayer9Style' Control = Panel1 end object Panel1: TPanel - Left = 360 + Left = 369 Top = 85 Width = 417 - Height = 592 + Height = 600 Align = alLeft Caption = 'Panel1' TabOrder = 7 @@ -1458,7 +1456,7 @@ object frmMarkingInspection: TfrmMarkingInspection Left = 1 Top = 1 Width = 415 - Height = 590 + Height = 598 Align = alClient TabOrder = 0 object Tv3: TcxGridDBTableView @@ -1554,8 +1552,8 @@ object frmMarkingInspection: TfrmMarkingInspection end end object Panel3: TPanel - Left = 374 - Top = 427 + Left = 398 + Top = 443 Width = 383 Height = 231 BevelInner = bvRaised