diff --git a/T05贸易门市管理/U_DataLink.pas b/T05贸易门市管理/U_DataLink.pas index ee395f6..0a3d54e 100644 --- a/T05贸易门市管理/U_DataLink.pas +++ b/T05贸易门市管理/U_DataLink.pas @@ -7,7 +7,7 @@ uses Windows, Messages, forms, OleCtnrs, DateUtils, ExtCtrls, SyncObjs, cxClasses, System.ImageList, U_BaseDataLink, dxCore, cxLocalization, dxLayoutLookAndFeels, cxImageList, cxGraphics, cxContainer, - cxEdit, dxSkinsForm; + cxEdit, dxSkinsForm, dxSkinsCore, dxSkinsDefaultPainters; type TMyThread = class(TThread) diff --git a/T05贸易门市管理/U_TradeMarketInPut.dfm b/T05贸易门市管理/U_TradeMarketInPut.dfm index 3680654..932a714 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.dfm +++ b/T05贸易门市管理/U_TradeMarketInPut.dfm @@ -67,7 +67,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut List = True ShowCaptions = True TabOrder = 1 - ExplicitTop = 254 object ToolButton4: TToolButton Left = 0 Top = 0 @@ -108,8 +107,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Align = alClient Caption = 'Panel2' TabOrder = 2 - ExplicitTop = 284 - ExplicitHeight = 581 object Panel3: TPanel Left = 1 Top = 1 @@ -118,7 +115,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Align = alClient Caption = 'Panel2' TabOrder = 0 - ExplicitHeight = 579 object cxGrid1: TcxGrid Left = 1 Top = 1 @@ -126,7 +122,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Height = 565 Align = alClient TabOrder = 0 - ExplicitHeight = 577 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> ScrollbarAnnotations.CustomAnnotations = <> @@ -329,7 +324,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Align = alRight Caption = 'Panel4' TabOrder = 1 - ExplicitHeight = 579 object Panel5: TPanel Left = 1 Top = 1 @@ -367,7 +361,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Align = alClient Caption = #21452#20987#21024#38500#26126#32454#20449#24687 TabOrder = 1 - ExplicitHeight = 536 object cxGrid2: TcxGrid Left = 2 Top = 23 @@ -375,7 +368,6 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Height = 499 Align = alClient TabOrder = 0 - ExplicitHeight = 511 object TvMX: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -448,6 +440,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut ParentCtl3D = False TabOrder = 3 OnClick = ScrollBox1Click + ExplicitTop = 24 object Label3: TLabel Left = 722 Top = 13 @@ -514,15 +507,15 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut object TMMNo: TcxTextEdit Tag = 2 Left = 114 - Top = 7 + Top = 9 TabOrder = 0 - Width = 150 + Width = 200 end object TMMDate: TDateTimePicker Tag = 2 Left = 806 Top = 9 - Width = 150 + Width = 200 Height = 29 BevelInner = bvNone Date = 40916.000000000000000000 @@ -534,7 +527,7 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Tag = 2 Left = 461 Top = 9 - Width = 150 + Width = 200 Height = 29 BevelInner = bvNone Date = 40916.000000000000000000 @@ -547,66 +540,94 @@ inherited frmTradeMarketInPut: TfrmTradeMarketInPut Tag = 2 Left = 112 Top = 126 - Width = 842 + Width = 894 Height = 58 Hint = 'OrdNote/'#22791#27880 ScrollBars = ssVertical TabOrder = 3 OnDblClick = PackNoteDblClick end - object CustName: TBtnEditC - Tag = 2 - Left = 461 - Top = 44 - Width = 150 - Height = 30 - ReadOnly = True - TabOrder = 4 - OnBtnUpClick = CustNameBtnUpClick - OnBtnDnClick = OurCoNameBtnDnClick - end - object OurCoName: TBtnEditC - Tag = 2 - Left = 114 - Top = 45 - Width = 150 - Height = 30 - ReadOnly = True - TabOrder = 5 - OnBtnUpClick = OurCoNameBtnUpClick - OnBtnDnClick = OurCoNameBtnDnClick - end - object CONTACT: TBtnEditC - Tag = 2 - Left = 461 - Top = 82 - Width = 493 - Height = 30 - TabOrder = 6 - end object OrdType: TComboBox Tag = 2 Left = 114 Top = 83 - Width = 100 + Width = 200 Height = 29 Style = csDropDownList Ctl3D = False Enabled = False ItemIndex = 0 ParentCtl3D = False - TabOrder = 7 + TabOrder = 4 Text = #27491#24120#21333 Items.Strings = ( #27491#24120#21333) end - object ShippingAddress: TBtnEditC + object OurCoName: TcxButtonEdit + Tag = 2 + Left = 112 + Top = 44 + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = True + Properties.OnButtonClick = OurCoNamePropertiesButtonClick + Style.ButtonStyle = btsDefault + TabOrder = 5 + OnDblClick = OurCoNameDblClick + Width = 200 + end + object CustName: TcxButtonEdit + Tag = 2 + Left = 461 + Top = 44 + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = True + Properties.OnButtonClick = CustNamePropertiesButtonClick + Style.ButtonStyle = btsDefault + TabOrder = 6 + OnDblClick = OurCoNameDblClick + Width = 200 + end + object ShippingAddress: TcxButtonEdit Tag = 2 Left = 806 - Top = 44 - Width = 150 - Height = 30 + Top = 45 + Hint = 'ShippingAddress/'#21457#36135#22320#22336 + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = True + Properties.OnButtonClick = ShippingAddressPropertiesButtonClick + Style.ButtonStyle = btsDefault + TabOrder = 7 + OnDblClick = OurCoNameDblClick + Width = 200 + end + object CONTACT: TcxButtonEdit + Tag = 2 + Left = 461 + Top = 83 + Hint = 'CONTACT/'#32852#31995#26041#24335 + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.ReadOnly = True + Properties.OnButtonClick = ShippingAddressPropertiesButtonClick + Style.ButtonStyle = btsDefault TabOrder = 8 + OnDblClick = OurCoNameDblClick + Width = 545 end end inherited ADOQueryBaseCmd: TADOQuery diff --git a/T05贸易门市管理/U_TradeMarketInPut.pas b/T05贸易门市管理/U_TradeMarketInPut.pas index f141bb4..c466cd7 100644 --- a/T05贸易门市管理/U_TradeMarketInPut.pas +++ b/T05贸易门市管理/U_TradeMarketInPut.pas @@ -12,10 +12,10 @@ uses cxCurrencyEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxDropDownEdit, RM_Common, RM_Preview, RM_System, RM_Class, RM_GridReport, RM_Dataset, Menus, cxSplitter, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, cxCheckBox, - dxDateRanges, dxBarBuiltInMenu, cxPC, - System.ImageList, Vcl.ImgList, U_BaseInput, cxImage, cxDBEdit, IdBaseComponent, - IdComponent, IdTCPConnection, IdTCPClient, IdExplicitTLSClientServerBase, - IdFTP, ShellAPI, dxScrollbarAnnotations, cxImageList; + dxDateRanges, dxBarBuiltInMenu, cxPC, System.ImageList, Vcl.ImgList, + U_BaseInput, cxImage, cxDBEdit, IdBaseComponent, IdComponent, IdTCPConnection, + IdTCPClient, IdExplicitTLSClientServerBase, IdFTP, ShellAPI, + dxScrollbarAnnotations, cxImageList, dxSkinsCore, dxSkinsDefaultPainters; type TfrmTradeMarketInPut = class(TfrmBaseInput) @@ -87,20 +87,18 @@ type TMMDate: TDateTimePicker; DLYDate: TDateTimePicker; OrdNote: TMemo; - CustName: TBtnEditC; - OurCoName: TBtnEditC; - CONTACT: TBtnEditC; OrdType: TComboBox; - ShippingAddress: TBtnEditC; + OurCoName: TcxButtonEdit; + CustName: TcxButtonEdit; + ShippingAddress: TcxButtonEdit; + CONTACT: TcxButtonEdit; procedure TBCloseClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure TBSaveClick(Sender: TObject); procedure ToolButton1Click(Sender: TObject); procedure ToolButton2Click(Sender: TObject); - procedure CustomerNoNameBtnDnClick(Sender: TObject); procedure v1OrderUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure v1PriceUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); - procedure YCLFactoryBtnUpClick(Sender: TObject); procedure ScrollBox1Click(Sender: TObject); procedure v1Column5PropertiesEditValueChanged(Sender: TObject); procedure HYTTBtnUpClick(Sender: TObject); @@ -109,11 +107,7 @@ type procedure v1OrderUnitPropertiesEditValueChanged(Sender: TObject); procedure Tv1Column4PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); procedure cxDBImage1DblClick(Sender: TObject); - procedure SYRNameBtnUpClick(Sender: TObject); procedure ToolButton3Click(Sender: TObject); - procedure CustNameBtnUpClick(Sender: TObject); - procedure OurCoNameBtnUpClick(Sender: TObject); - procedure OurCoNameBtnDnClick(Sender: TObject); procedure TechnicsBtnUpClick(Sender: TObject); procedure TechnicsBtnDnClick(Sender: TObject); procedure PackNoteDblClick(Sender: TObject); @@ -122,6 +116,10 @@ type procedure QtyMXKeyPress(Sender: TObject; var Key: Char); procedure Tv1FocusedRecordChanged(Sender: TcxCustomGridTableView; APrevFocusedRecord, AFocusedRecord: TcxCustomGridRecord; ANewItemRecordFocusingChanged: Boolean); procedure TvMXCellDblClick(Sender: TcxCustomGridTableView; ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton; AShift: TShiftState; var AHandled: Boolean); + procedure OurCoNameDblClick(Sender: TObject); + procedure OurCoNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure ShippingAddressPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure CustNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); private FSCXDH: string; procedure InitData(); @@ -224,8 +222,8 @@ begin SCSHData(ADOTemp, ScrollBox1, 5); SCSHData(ADOTemp, ScrollBox1, 9); SCSHData(ADOTemp, ScrollBox1, 7); - OurCoName.TxtCode := Trim(ADOTemp.FieldByName('OurCoNo').AsString); - CustName.TxtCode := Trim(ADOTemp.FieldByName('CustNo').AsString); + OurCoName.Properties.LookupItems.Text := Trim(ADOTemp.FieldByName('OurCoNo').AsString); + CustName.Properties.LookupItems.Text := Trim(ADOTemp.FieldByName('CustNo').AsString); with ADOTemp do begin Close; @@ -345,8 +343,8 @@ begin end; RTSetsavedata(ADOCmd, 'Trade_Market_Main', ScrollBox1, 2); FieldByName('TMMID').Value := Trim(maxno); - FieldByName('OurCoNo').Value := Trim(OurCoName.TxtCode); - FieldByName('CustNo').Value := Trim(CustName.TxtCode); + FieldByName('OurCoNo').Value := Trim(OurCoName.Properties.LookupItems.Text); + FieldByName('CustNo').Value := Trim(CustName.Properties.LookupItems.Text); Post; end; @@ -421,7 +419,6 @@ begin // FieldByName('TPFId').Value := Trim(FTMMID); // Post; // end; - ///////////////////// ӹ /////////////////////////// /// /////////////// /////////////// @@ -444,7 +441,6 @@ begin // FieldByName('RuleID').Value := Trim(FTMMID); // Post; // end; - /////////////// /////////////// with ADOCmd do @@ -737,8 +733,8 @@ end; procedure TfrmTradeMarketInPut.TechnicsBtnDnClick(Sender: TObject); begin - TBtnEditC(Sender).Text := ''; - TBtnEditC(Sender).TxtCode := ''; + TcxButtonEdit(Sender).Text := ''; + TcxButtonEdit(Sender).Properties.LookupItems.Text := ''; end; procedure TfrmTradeMarketInPut.TechnicsBtnUpClick(Sender: TObject); @@ -765,7 +761,7 @@ begin end; -procedure TfrmTradeMarketInPut.CustNameBtnUpClick(Sender: TObject); +procedure TfrmTradeMarketInPut.CustNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try frmCompanySel := TfrmCompanySel.Create(Application); @@ -774,7 +770,7 @@ begin FCoType := 'ͻ'; if ShowModal = 1 then begin - self.CustName.TxtCode := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString); + self.CustName.Properties.LookupItems.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString); self.CustName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString); end; end; @@ -784,12 +780,6 @@ begin end; end; -procedure TfrmTradeMarketInPut.CustomerNoNameBtnDnClick(Sender: TObject); -begin - TBtnEditC(Sender).Text := ''; - TBtnEditC(Sender).TxtCode := ''; -end; - procedure TfrmTradeMarketInPut.cxDBImage1DblClick(Sender: TObject); begin if TcxDBImage(Sender).Picture.Height = 0 then @@ -839,6 +829,31 @@ begin ShellExecute(Handle, 'open', PChar(sFieldName), '', '', SW_SHOWNORMAL); end; +procedure TfrmTradeMarketInPut.OurCoNameDblClick(Sender: TObject); +begin + TcxButtonEdit(Sender).Text := ''; + TcxButtonEdit(Sender).Properties.LookupItems.Text := ''; +end; + +procedure TfrmTradeMarketInPut.OurCoNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); +begin + try + frmCompanySel := TfrmCompanySel.Create(Application); + with frmCompanySel do + begin + FCoType := '˾'; + if ShowModal = 1 then + begin + self.OurCoName.Properties.LookupItems.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString); + self.OurCoName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString); + end; + end; + + finally + frmCompanySel.Free; + end; +end; + procedure TfrmTradeMarketInPut.v1OrderUnitPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); var mvalues: string; @@ -963,12 +978,17 @@ begin end; end; -procedure TfrmTradeMarketInPut.YCLFactoryBtnUpClick(Sender: TObject); +procedure TfrmTradeMarketInPut.ScrollBox1Click(Sender: TObject); +begin + TMMDate.SetFocus; +end; + +procedure TfrmTradeMarketInPut.ShippingAddressPropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); var fsj: string; FWZ: Integer; begin - fsj := Trim(TcxTextEdit(Sender).Hint); + fsj := Trim(TcxButtonEdit(Sender).Hint); FWZ := Pos('/', fsj); try frmZDYHelp := TfrmZDYHelp.Create(Application); @@ -978,7 +998,7 @@ begin flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ); if ShowModal = 1 then begin - TcxTextEdit(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); + TcxButtonEdit(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); end; end; finally @@ -986,37 +1006,6 @@ begin end; end; -procedure TfrmTradeMarketInPut.ScrollBox1Click(Sender: TObject); -begin - TMMDate.SetFocus; -end; - -procedure TfrmTradeMarketInPut.OurCoNameBtnDnClick(Sender: TObject); -begin - TBtnEditC(Sender).Text := ''; - TBtnEditC(Sender).TxtCode := ''; -end; - -procedure TfrmTradeMarketInPut.OurCoNameBtnUpClick(Sender: TObject); -begin - try - frmCompanySel := TfrmCompanySel.Create(Application); - with frmCompanySel do - begin - FCoType := '˾'; - if ShowModal = 1 then - begin - self.OurCoName.TxtCode := Trim(frmCompanySel.CDS_1.fieldbyname('CoCode').AsString); - self.OurCoName.Text := Trim(frmCompanySel.CDS_1.fieldbyname('CoAbbrName').AsString); - end; - end; - - finally - frmCompanySel.Free; - end; - -end; - procedure TfrmTradeMarketInPut.PackNoteDblClick(Sender: TObject); var fsj: string; @@ -1121,30 +1110,6 @@ begin end; end; -procedure TfrmTradeMarketInPut.SYRNameBtnUpClick(Sender: TObject); -var - fsj: string; - FWZ: Integer; -begin - fsj := Trim(TcxTextEdit(Sender).Hint); - FWZ := Pos('/', fsj); - try - frmZDYHelp := TfrmZDYHelp.Create(Application); - with frmZDYHelp do - begin - fnote := True; - flag := Copy(fsj, 1, FWZ - 1); - flagname := Copy(fsj, FWZ + 1, Length(fsj) - FWZ); - if ShowModal = 1 then - begin - TcxTextEdit(Sender).Text := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); - end; - end; - finally - frmZDYHelp.Free; - end; -end; - procedure TfrmTradeMarketInPut.Tv1Column1PropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin inherited; diff --git a/T05贸易门市管理/U_TradeMarketList.dfm b/T05贸易门市管理/U_TradeMarketList.dfm index fca1d56..f529e3f 100644 --- a/T05贸易门市管理/U_TradeMarketList.dfm +++ b/T05贸易门市管理/U_TradeMarketList.dfm @@ -232,7 +232,9 @@ inherited frmTradeMarketList: TfrmTradeMarketList Width = 1536 Height = 37 Align = alTop + Color = clWhite ParentBackground = False + ParentColor = False TabOrder = 4 ExplicitLeft = 2 ExplicitTop = 2 diff --git a/T05贸易门市管理/U_TradeMarketList.pas b/T05贸易门市管理/U_TradeMarketList.pas index 45140a6..1027889 100644 --- a/T05贸易门市管理/U_TradeMarketList.pas +++ b/T05贸易门市管理/U_TradeMarketList.pas @@ -16,7 +16,7 @@ uses cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, Math, dxDateRanges, IdExplicitTLSClientServerBase, U_BaseList, Vcl.Clipbrd, dxScrollbarAnnotations, - cxProgressBar, FrameDateSel; + cxProgressBar, FrameDateSel, dxSkinsCore, dxSkinsDefaultPainters; type TfrmTradeMarketList = class(TfrmBaseList) diff --git a/T05贸易门市管理/U_testdll.dfm b/T05贸易门市管理/U_testdll.dfm index b6709e4..e0d0237 100644 --- a/T05贸易门市管理/U_testdll.dfm +++ b/T05贸易门市管理/U_testdll.dfm @@ -30,10 +30,9 @@ object Form1: TForm1 object Edit1: TcxTextEdit Left = 0 Top = 0 - Width = 81 - Height = 22 TabOrder = 0 Text = '1' + Width = 81 end object ToolButton1: TToolButton Left = 81 @@ -52,9 +51,8 @@ object Form1: TForm1 object DllName: TcxTextEdit Left = 217 Top = 0 - Width = 135 - Height = 22 TabOrder = 1 + Width = 135 end end object MainMenu1: TMainMenu diff --git a/T05贸易门市管理/U_testdll.pas b/T05贸易门市管理/U_testdll.pas index 75ff18e..1e95851 100644 --- a/T05贸易门市管理/U_testdll.pas +++ b/T05贸易门市管理/U_testdll.pas @@ -5,7 +5,9 @@ interface uses Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, Dialogs, ExtCtrls, StdCtrls, Menus, ToolWin, ComCtrls, ImgList, DB, ADODB, - System.ImageList; + System.ImageList, cxGraphics, cxControls, cxLookAndFeels, + cxLookAndFeelPainters, cxContainer, cxEdit, dxSkinsCore, + dxSkinsDefaultPainters, cxTextEdit; type TForm1 = class(TForm) @@ -52,7 +54,6 @@ var begin //̬ //newh:=getForm(Application,1,ADOConnection1,PChar('sa'),PChar('dsa')); - //̬ // showMessage(intTostr(application.Handle)); Th := LoadLibrary('TradeMarket.dll');