diff --git a/打卷检验管理/U_JYOrderCDOne.dfm b/打卷检验管理/U_JYOrderCDOne.dfm index 69cb28a..f37e2e3 100644 --- a/打卷检验管理/U_JYOrderCDOne.dfm +++ b/打卷检验管理/U_JYOrderCDOne.dfm @@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Left = 0 Top = 0 Width = 1392 - Height = 92 + Height = 62 AutoSize = True ButtonHeight = 30 ButtonWidth = 119 @@ -101,28 +101,27 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 0 Caption = #25209#37327#20462#25913#32568#21495 ImageIndex = 54 - Wrap = True OnClick = ToolButton11Click end object TBDW: TToolButton - Left = 0 - Top = 30 + Left = 608 + Top = 0 AutoSize = True Caption = #20462#25913#25968#37327#21333#20301 ImageIndex = 54 OnClick = TBDWClick end object ToolButton4: TToolButton - Left = 111 - Top = 30 + Left = 719 + Top = 0 AutoSize = True Caption = #25209#37327#35843#25972#31859#25968 ImageIndex = 54 OnClick = ToolButton4Click end object ToolButton13: TToolButton - Left = 222 - Top = 30 + Left = 830 + Top = 0 AutoSize = True Caption = #25209#37327#20928#37325#36716#38271#24230 ImageIndex = 54 @@ -130,23 +129,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton13Click end object ToolButton8: TToolButton - Left = 345 - Top = 30 + Left = 953 + Top = 0 AutoSize = True Caption = #25209#37327#20462#25913#30382#37325 ImageIndex = 54 OnClick = ToolButton8Click end object ToolButton1: TToolButton - Left = 456 - Top = 30 + Left = 1064 + Top = 0 AutoSize = True Caption = #25171#21360#26631#31614 ImageIndex = 96 + Wrap = True OnClick = ToolButton1Click end object TCPDB: TToolButton - Left = 543 + Left = 0 Top = 30 AutoSize = True Caption = #25104#21697#25171#21253 @@ -154,7 +154,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = TCPDBClick end object ToolButton3: TToolButton - Left = 630 + Left = 87 Top = 30 AutoSize = True Caption = #25171#21360#21253#26631#31614 @@ -163,25 +163,24 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton3Click end object ToolButton2: TToolButton - Left = 729 + Left = 186 Top = 30 AutoSize = True Caption = #25171#21360#26816#39564#25253#21578 ImageIndex = 12 - Wrap = True OnClick = ToolButton2Click end object ToolButton5: TToolButton - Left = 0 - Top = 60 + Left = 297 + Top = 30 AutoSize = True Caption = #25171#21360 ImageIndex = 12 OnClick = ToolButton5Click end object Edit3: TEdit - Left = 63 - Top = 60 + Left = 360 + Top = 30 Width = 68 Height = 30 Font.Charset = GB2312_CHARSET @@ -195,8 +194,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnKeyPress = Edit3KeyPress end object ComboBox1: TComboBox - Left = 131 - Top = 63 + Left = 428 + Top = 33 Width = 149 Height = 24 Style = csDropDownList @@ -220,8 +219,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #26816#39564#30721#21333) end object Edit4: TEdit - Left = 280 - Top = 60 + Left = 577 + Top = 30 Width = 121 Height = 30 Font.Charset = GB2312_CHARSET @@ -234,41 +233,48 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False end object ToolButton12: TToolButton - Left = 401 - Top = 60 + Left = 698 + Top = 30 Caption = #20462#25913#30721#21333 ImageIndex = 54 Visible = False OnClick = ToolButton12Click end object ToolButton9: TToolButton - Left = 520 - Top = 60 + Left = 817 + Top = 30 AutoSize = True Caption = #24322#24120#25968#25454 ImageIndex = 2 OnClick = ToolButton9Click end object TBExport: TToolButton - Left = 607 - Top = 60 + Left = 904 + Top = 30 AutoSize = True Caption = #23548#20986 ImageIndex = 75 OnClick = TBExportClick end object TBClose: TToolButton - Left = 670 - Top = 60 + Left = 967 + Top = 30 AutoSize = True Caption = #20851#38381 ImageIndex = 55 OnClick = TBCloseClick end + object ToolButton14: TToolButton + Left = 1030 + Top = 30 + Caption = #25209#37327#20462#25913#31867#22411 + ImageIndex = 54 + OnClick = ToolButton14Click + end end object Panel1: TPanel Left = 0 - Top = 92 + Top = 62 Width = 1392 Height = 88 Align = alTop @@ -783,9 +789,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object cxGrid1: TcxGrid Left = 0 - Top = 180 + Top = 150 Width = 1392 - Height = 546 + Height = 576 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 @@ -1188,8 +1194,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end end object MovePanel2: TMovePanel - Left = 416 - Top = 192 + Left = 584 + Top = 224 Width = 289 Height = 49 BevelInner = bvLowered @@ -1205,8 +1211,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False end object Panel5: TPanel - Left = 736 - Top = 188 + Left = 720 + Top = 268 Width = 273 Height = 101 Color = clSkyBlue @@ -1220,8 +1226,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Caption = #25968#37327#21333#20301 end object ComboBox5: TComboBox - Left = 100 - Top = 24 + Left = 92 + Top = 32 Width = 145 Height = 20 Style = csDropDownList @@ -1604,8 +1610,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end end object Panel9: TPanel - Left = 804 - Top = 244 + Left = 1076 + Top = 260 Width = 225 Height = 117 Color = clSkyBlue @@ -1862,6 +1868,53 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne '4') end end + object Panel14: TPanel + Left = 196 + Top = 376 + Width = 225 + Height = 101 + Color = clSkyBlue + TabOrder = 14 + Visible = False + object Label37: TLabel + Left = 16 + Top = 28 + Width = 24 + Height = 12 + Caption = #31867#22411 + end + object ComboBox4: TComboBox + Left = 56 + Top = 24 + Width = 145 + Height = 20 + Style = csDropDownList + ItemHeight = 12 + TabOrder = 0 + Items.Strings = ( + #27491#21697 + #27425#21697 + '') + end + object Button15: TButton + Left = 24 + Top = 64 + Width = 60 + Height = 25 + Caption = #30830#23450 + TabOrder = 1 + OnClick = Button15Click + end + object Button16: TButton + Left = 136 + Top = 64 + Width = 60 + Height = 25 + Caption = #20851#38381 + TabOrder = 2 + OnClick = Button16Click + end + end object cxGridPopupMenu1: TcxGridPopupMenu Grid = cxGrid1 PopupMenus = <> diff --git a/打卷检验管理/U_JYOrderCDOne.pas b/打卷检验管理/U_JYOrderCDOne.pas index 7f08f57..a0a5adf 100644 --- a/打卷检验管理/U_JYOrderCDOne.pas +++ b/打卷检验管理/U_JYOrderCDOne.pas @@ -11,20 +11,7 @@ uses cxGrid, DBClient, cxCheckBox, cxCalendar, cxSplitter, RM_Dataset, RM_System, RM_Common, RM_Class, RM_GridReport, RM_e_Xls, Menus, MovePanel, cxTextEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxContainer, ShellAPI, - cxCurrencyEdit, MMSystem, 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; + cxCurrencyEdit, MMSystem; type TfrmJYOrderCDOne = class(TForm) @@ -222,6 +209,12 @@ type Label36: TLabel; ComboBox3: TComboBox; Edit6: TEdit; + ToolButton14: TToolButton; + Panel14: TPanel; + Label37: TLabel; + ComboBox4: TComboBox; + Button15: TButton; + Button16: TButton; procedure FormDestroy(Sender: TObject); procedure FormClose(Sender: TObject; var Action: TCloseAction); procedure FormCreate(Sender: TObject); @@ -283,6 +276,9 @@ type procedure Button8Click(Sender: TObject); procedure Button14Click(Sender: TObject); procedure Button13Click(Sender: TObject); + procedure ToolButton14Click(Sender: TObject); + procedure Button15Click(Sender: TObject); + procedure Button16Click(Sender: TObject); // procedure Edit5Click(Sender: TObject); // procedure CheckBox3Click(Sender: TObject); private @@ -434,10 +430,9 @@ begin if Fieldbyname('ssel').AsBoolean then begin sumP := sumP + 1; - sumLen := RoundFloat(sumLen + Order_Main.fieldbyname('mjlen').AsFloat, 2); + sumLen := RoundFloat(sumLen + Order_Main.fieldbyname('mjlen').AsFloat, 2); sumMZ := RoundFloat(sumMZ + Order_Main.fieldbyname('mjmaoz').AsFloat, 2); - sumJZ := RoundFloat(sumJZ + Order_Main.fieldbyname('mjqty4').AsFloat, 2) -// sumMZ := sumMZ + Order_Main.fieldbyname('mjmaoz').AsFloat; + sumJZ := RoundFloat(sumJZ + Order_Main.fieldbyname('mjqty4').AsFloat, 2)// sumMZ := sumMZ + Order_Main.fieldbyname('mjmaoz').AsFloat; // sumJZ := sumJZ + Order_Main.fieldbyname('mjqty4').AsFloat; end; @@ -676,7 +671,7 @@ procedure TfrmJYOrderCDOne.TBZFClick(Sender: TObject); begin if Order_Main.Locate('ssel', True, []) = False then begin - Application.MessageBox('ûѡ!', 'ʾ', 0); + Application.MessageBox('ûѡ!', 'ʾ', 0); Exit; end; if Application.MessageBox('ȷҪϺݲָܻ', 'ʾ', 32 + 4) <> IDYES then @@ -1543,9 +1538,9 @@ begin Open; end; end; - if (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥()') then + if (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥()') then begin - with ADOQueryTemp do + with ADOQueryTemp do begin Close; sql.Clear; @@ -1589,13 +1584,13 @@ begin sql.Clear; sql.add('exec P_Do_PrintMd_HZ '); sql.add('@mainID=' + quotedstr(Trim(''))); - sql.add(',@DName=' + quotedstr(Trim(DCode))); + sql.add(',@DName=' + quotedstr(Trim(DCode))); sql.add(',@flag=''2'' '); Open; - end; + end; end; - if (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥(Ӣ)')or (trim(ComboBox1.Text) = '뵥()') then + if (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = '뵥()') or (trim(ComboBox1.Text) = '뵥(Ӣ)') or (trim(ComboBox1.Text) = '뵥()') then begin with ADOQueryTemp do begin @@ -2274,5 +2269,59 @@ begin end; +procedure TfrmJYOrderCDOne.ToolButton14Click(Sender: TObject); +begin + Panel14.Left := (self.Width - Panel14.Width) div 2; + Panel14.Visible := true; +end; + +procedure TfrmJYOrderCDOne.Button15Click(Sender: TObject); +begin + if Order_Main.IsEmpty then + Exit; + if Order_Main.Locate('SSel', True, []) = False then + begin + Application.MessageBox('ûѡ!', 'ʾ', 0); + Exit; + end; + try + Order_Main.DisableControls; + ADOQueryCmd.Connection.BeginTrans; + with Order_Main do + begin + First; + while not Eof do + begin + if Order_Main.FieldByName('SSel').AsBoolean = True then + begin + with ADOQueryCmd do + begin + Close; + sql.Clear; + sql.Add('Update WFB_MJJY Set MJType=''' + trim(ComboBox4.Text) + ''' '); + sql.Add('where MJID=''' + Trim(Order_Main.fieldbyname('MJID').AsString) + ''''); + ExecSQL; + end; + end; + Next; + end; + end; + ADOQueryCmd.Connection.CommitTrans; + Order_Main.EnableControls; + application.MessageBox('޸ijɹ', 'ʾϢ'); + Panel14.Visible := false; + TBRafresh.Click; + except + ADOQueryCmd.Connection.RollbackTrans; + Order_Main.EnableControls; + application.MessageBox('޸ʧܣ', 'ʾϢ', 0); + end; +end; + +procedure TfrmJYOrderCDOne.Button16Click(Sender: TObject); +begin + Panel14.Visible := false; +end; + end. diff --git a/打卷检验管理/U_MJManageNewFDNew.dfm b/打卷检验管理/U_MJManageNewFDNew.dfm index 488ab1c..37a1610 100644 --- a/打卷检验管理/U_MJManageNewFDNew.dfm +++ b/打卷检验管理/U_MJManageNewFDNew.dfm @@ -1394,7 +1394,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 51 Top = 377 Width = 86 - Height = 32 + Height = 41 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -32 @@ -1749,7 +1749,7 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF Left = 79 Top = 440 Width = 80 - Height = 30 + Height = 36 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -28 @@ -1759,14 +1759,13 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF ParentFont = False TabOrder = 22 OnClick = MJXHClick - OnExit = MJStr4Exit OnKeyPress = MJstr3KeyPress end object CheckKZ: TEdit Left = 79 Top = 470 Width = 80 - Height = 29 + Height = 36 Font.Charset = GB2312_CHARSET Font.Color = clWindowText Font.Height = -28 @@ -1776,7 +1775,6 @@ object frmMJManageNewFDNewSF: TfrmMJManageNewFDNewSF ParentFont = False TabOrder = 23 OnClick = MJXHClick - OnExit = MJStr4Exit OnKeyPress = MJstr3KeyPress end end diff --git a/打卷检验管理/U_MJManageNewFDNew.pas b/打卷检验管理/U_MJManageNewFDNew.pas index c9daba4..46b269e 100644 --- a/打卷检验管理/U_MJManageNewFDNew.pas +++ b/打卷检验管理/U_MJManageNewFDNew.pas @@ -10,21 +10,7 @@ uses cxControls, cxGridCustomView, cxGrid, RM_Common, RM_Class, RM_GridReport, RM_System, RM_Dataset, ADODB, DBClient, cxGridCustomPopupMenu, cxGridPopupMenu, ExtCtrls, ComCtrls, ToolWin, cxTextEdit, Buttons, cxSplitter, cxCheckBox, - MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, ShellAPI, - 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; + MovePanel, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, ShellAPI; type TfrmMJManageNewFDNewSF = class(TForm) @@ -1756,7 +1742,13 @@ begin MJLen.SetFocus; // MJQty4.OnClick(MJQty4); MJLen.OnClick(Mjlen); - + CheckMF.Text := ''; + CheckKZ.Text := ''; + if Trim(Edit4.Text) = '' then + begin + Edit3.Text := ''; // Edit3 + Edit3.Text := ''; // ѡEdit3 + end; end; procedure TfrmMJManageNewFDNewSF.PrtData(FMJID: string); @@ -2495,7 +2487,7 @@ begin begin MJXH.Text := inttostr(ADOTmp.fieldbyname('maxMJxh').AsInteger + 1); end - else + else begin MJXH.Text := inttostr(ADOTmp.fieldbyname('minMJxh').AsInteger - 1); end;