diff --git a/复合检验管理/TradeManage.dof b/复合检验管理/TradeManage.dof index 21fec57..7ebb586 100644 --- a/复合检验管理/TradeManage.dof +++ b/复合检验管理/TradeManage.dof @@ -101,7 +101,7 @@ DebugSourceDirs= UsePackages=0 [Parameters] RunParams= -HostApplication=D:\Ŀ\Ŀ\\ϼ\testDll.exe +HostApplication=D:\Dp7Repo\Ŀ\D7DJguokun\ϼ\testDll.exe Launcher= UseLauncher=0 DebugCWD= diff --git a/复合检验管理/U_JYOrderCDOne.dfm b/复合检验管理/U_JYOrderCDOne.dfm index fb8ab50..8469baa 100644 --- a/复合检验管理/U_JYOrderCDOne.dfm +++ b/复合检验管理/U_JYOrderCDOne.dfm @@ -22,7 +22,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Left = 0 Top = 0 Width = 1384 - Height = 62 + Height = 92 AutoSize = True ButtonHeight = 30 ButtonWidth = 119 @@ -101,27 +101,28 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Top = 0 Caption = #25209#37327#20462#25913#32568#21495 ImageIndex = 54 + Wrap = True OnClick = ToolButton11Click end object TBDW: TToolButton - Left = 608 - Top = 0 + Left = 0 + Top = 30 AutoSize = True Caption = #20462#25913#25968#37327#21333#20301 ImageIndex = 54 OnClick = TBDWClick end object ToolButton4: TToolButton - Left = 719 - Top = 0 + Left = 111 + Top = 30 AutoSize = True Caption = #25209#37327#35843#25972#31859#25968 ImageIndex = 54 OnClick = ToolButton4Click end object ToolButton13: TToolButton - Left = 830 - Top = 0 + Left = 222 + Top = 30 AutoSize = True Caption = #25209#37327#20928#37325#36716#38271#24230 ImageIndex = 54 @@ -129,23 +130,22 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton13Click end object ToolButton8: TToolButton - Left = 953 - Top = 0 + Left = 345 + Top = 30 AutoSize = True Caption = #25209#37327#20462#25913#30382#37325 ImageIndex = 54 OnClick = ToolButton8Click end object ToolButton14: TToolButton - Left = 1064 - Top = 0 + Left = 456 + Top = 30 Caption = #25209#37327#20462#25913#31995#25968 ImageIndex = 54 - Wrap = True OnClick = ToolButton14Click end object ToolButton1: TToolButton - Left = 0 + Left = 575 Top = 30 AutoSize = True Caption = #25171#21360#26631#31614 @@ -153,7 +153,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = ToolButton1Click end object TCPDB: TToolButton - Left = 87 + Left = 662 Top = 30 AutoSize = True Caption = #25104#21697#25171#21253 @@ -162,33 +162,34 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnClick = TCPDBClick end object ToolButton3: TToolButton - Left = 174 + Left = 749 Top = 30 AutoSize = True Caption = #25171#21360#21253#26631#31614 ImageIndex = 12 + Wrap = True Visible = False OnClick = ToolButton3Click end object ToolButton2: TToolButton - Left = 273 - Top = 30 + Left = 0 + Top = 60 AutoSize = True Caption = #25171#21360#26816#39564#25253#21578 ImageIndex = 12 OnClick = ToolButton2Click end object ToolButton5: TToolButton - Left = 384 - Top = 30 + Left = 111 + Top = 60 AutoSize = True Caption = #25171#21360 ImageIndex = 12 OnClick = ToolButton5Click end object Edit3: TEdit - Left = 447 - Top = 30 + Left = 174 + Top = 60 Width = 68 Height = 30 Font.Charset = GB2312_CHARSET @@ -202,8 +203,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne OnKeyPress = Edit3KeyPress end object ComboBox1: TComboBox - Left = 515 - Top = 33 + Left = 242 + Top = 63 Width = 149 Height = 24 Style = csDropDownList @@ -227,8 +228,8 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne #26816#39564#30721#21333) end object Edit4: TEdit - Left = 664 - Top = 30 + Left = 391 + Top = 60 Width = 121 Height = 30 Font.Charset = GB2312_CHARSET @@ -241,32 +242,32 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne Visible = False end object ToolButton12: TToolButton - Left = 785 - Top = 30 + Left = 512 + Top = 60 Caption = #20462#25913#30721#21333 ImageIndex = 54 Visible = False OnClick = ToolButton12Click end object ToolButton9: TToolButton - Left = 904 - Top = 30 + Left = 631 + Top = 60 AutoSize = True Caption = #24322#24120#25968#25454 ImageIndex = 2 OnClick = ToolButton9Click end object TBExport: TToolButton - Left = 991 - Top = 30 + Left = 718 + Top = 60 AutoSize = True Caption = #23548#20986 ImageIndex = 75 OnClick = TBExportClick end object TBClose: TToolButton - Left = 1054 - Top = 30 + Left = 781 + Top = 60 AutoSize = True Caption = #20851#38381 ImageIndex = 55 @@ -275,7 +276,7 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object Panel1: TPanel Left = 0 - Top = 62 + Top = 92 Width = 1384 Height = 88 Align = alTop @@ -821,9 +822,9 @@ object frmJYOrderCDOne: TfrmJYOrderCDOne end object cxGrid1: TcxGrid Left = 0 - Top = 150 + Top = 180 Width = 1384 - Height = 568 + Height = 538 Align = alClient PopupMenu = PopupMenu1 TabOrder = 3 diff --git a/复合检验管理/U_JYOrderCDOne.pas b/复合检验管理/U_JYOrderCDOne.pas index 61626f0..1496192 100644 --- a/复合检验管理/U_JYOrderCDOne.pas +++ b/复合检验管理/U_JYOrderCDOne.pas @@ -1623,7 +1623,7 @@ begin end; end; - if (trim(ComboBox1.Text) = '뵥') then + if (trim(ComboBox1.Text) = '뵥') or (trim(ComboBox1.Text) = 'ϸ뵥') then begin with ADOQueryTemp do begin @@ -1669,11 +1669,11 @@ begin sql.add('exec P_Do_PrintMd_HZ '); sql.add('@mainID=' + quotedstr(Trim(''))); sql.add(',@DName=' + quotedstr(Trim(DCode))); - sql.add(',@flag=''2'' '); + sql.add(',@flag=''2'' '); Open; end; end; - if (trim(ComboBox1.Text) = '뵥(ӡ)') then + if (trim(ComboBox1.Text) = '뵥(ӡ)') or (trim(ComboBox1.Text) = 'ͻ') then begin with ADOQueryTemp do begin @@ -1987,7 +1987,7 @@ procedure TfrmJYOrderCDOne.ToolButton10Click(Sender: TObject); begin Panel_SMCK.Left := (self.Width - Panel_SMCK.Width) div 2; Panel_SMCK.Visible := true; - edit_CKMJID.SetFocus; + edit_CKMJID.SetFocus; end; procedure TfrmJYOrderCDOne.CheckBox3Click(Sender: TObject);