diff --git a/A09财务通用管理/Financial.dproj.local b/A09财务通用管理/Financial.dproj.local index 4ee1119..a53d8f6 100644 --- a/A09财务通用管理/Financial.dproj.local +++ b/A09财务通用管理/Financial.dproj.local @@ -3,17 +3,17 @@ 1899/12/30 00:00:00.000.742,=D:\Dp10RepoV1\public10\design\U_cxGridCustomSet.pas 1899/12/30 00:00:00.000.692,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ClothInfoSel.pas - 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.092,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_EmployeeSel.pas 1899/12/30 00:00:00.000.292,=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_FinPurchasePlanSel.pas 1899/12/30 00:00:00.000.716,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_ProcessSel.pas 1899/12/30 00:00:00.000.979,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_InvoiceOutInPut.pas - 1899/12/30 00:00:00.000.630,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.868,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\InformationBase.dproj=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\Financial.dproj 1899/12/30 00:00:00.000.621,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInList.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutList.dfm 1899/12/30 00:00:00.000.123,=D:\Dp10Repo\public10\design\U_globalVar.pas 1899/12/30 00:00:00.000.871,D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceInInPut.dfm=D:\Dp10Repo\项目代码\RTBasics\A09财务通用管理\U_InvoiceOutInPut.dfm - 1899/12/30 00:00:00.000.422,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas + 1899/12/30 00:00:00.000.734,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.895,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_InvoiceOutList.pas 1899/12/30 00:00:00.000.159,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CustStatementWriteOff.pas 1899/12/30 00:00:00.000.939,=D:\Dp10Repo\public10\design\U_BaseInput.pas @@ -35,16 +35,16 @@ 1899/12/30 00:00:00.000.616,D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LablePrint.pas=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_CompanySel.pas 1899/12/30 00:00:00.000.381,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_ReceivableInput.pas 1899/12/30 00:00:00.000.015,=D:\Dp10Repo\public10\ThreeFun\Fun\U_RTFun.pas - 1899/12/30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas 1899/12/30 00:00:00.000.052,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_GETableBatchInput.dfm=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_PayableBatchInput.dfm - 1899/12/30 00:00:00.000.727,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas + 1899/12/30 00:00:00.000.307,=D:\Dp10Repo\项目代码\RTBasics\A00通用窗体\U_LabelPrint.pas + 1899/12/30 00:00:00.000.874,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayableList.pas 1899/12/30 00:00:00.000.765,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_BankFlowTotalList.pas 1899/12/30 00:00:00.000.086,=D:\Dp10Repo\public10\design\U_cxGridCustomCss.pas 1899/12/30 00:00:00.000.659,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_CustStatement.pas 1899/12/30 00:00:00.000.736,D:\Dp10Repo\项目代码\睿特\新DLL初始化(CSH.dll)\U_ModuleNote.pas= 1899/12/30 00:00:00.000.052,D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_GETableBatchInput.pas=D:\Dp10RepoV1\项目代码\D10SZKaiXiYa\A09财务通用管理\U_PayableBatchInput.pas 1899/12/30 00:00:00.000.178,=D:\Dp10Repo\public10\design\U_WindowFormdesign.pas - 1899/12/30 00:00:00.000.874,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayableList.pas + 1899/12/30 00:00:00.000.727,=D:\Dp10RepoV1\public10\ThreeFun\Fun\uSZHN_JSON.pas 1899/12/30 00:00:00.000.508,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_ReceivableList.pas 1899/12/30 00:00:00.000.912,=D:\Dp10RepoV1\项目代码\RTBasicsV1\A09财务通用管理\U_PayList.pas 1899/12/30 00:00:00.000.149,=D:\Dp10Repo\public10\ThreeFun\Form\U_ZDYHelp.pas diff --git a/A09财务通用管理/Financial.identcache b/A09财务通用管理/Financial.identcache index e1dddc8..cef47ab 100644 Binary files a/A09财务通用管理/Financial.identcache and b/A09财务通用管理/Financial.identcache differ diff --git a/A09财务通用管理/U_CustStatement.pas b/A09财务通用管理/U_CustStatement.pas index 850fadf..904ad95 100644 --- a/A09财务通用管理/U_CustStatement.pas +++ b/A09财务通用管理/U_CustStatement.pas @@ -16,7 +16,7 @@ uses dxBarBuiltInMenu, cxPC, dxDateRanges, U_BaseList, Vcl.Menus, Vcl.Clipbrd, DateUtils, cxContainer, dxCore, cxDateUtils, cxDropDownEdit, dxSkinsCore, dxSkinsDefaultPainters, - dxScrollbarAnnotations, cxProgressBar; + dxScrollbarAnnotations, cxProgressBar, dxSkinWXI; type TfrmCustStatement = class(TfrmBaseList) diff --git a/A09财务通用管理/U_FinTradePlanSel.dfm b/A09财务通用管理/U_FinTradePlanSel.dfm index 02e8bee..68fb167 100644 --- a/A09财务通用管理/U_FinTradePlanSel.dfm +++ b/A09财务通用管理/U_FinTradePlanSel.dfm @@ -70,7 +70,6 @@ inherited frmFinTradePlanSel: TfrmFinTradePlanSel BevelInner = bvRaised BevelOuter = bvLowered TabOrder = 1 - ExplicitTop = 44 object Label3: TLabel Left = 39 Top = 10 @@ -233,7 +232,6 @@ inherited frmFinTradePlanSel: TfrmFinTradePlanSel Height = 546 Align = alClient TabOrder = 2 - ExplicitLeft = -8 object Tv1: TcxGridDBTableView OnDblClick = TV1DblClick Navigator.Buttons.CustomButtons = <> diff --git a/A09财务通用管理/U_FinTradePlanSel.pas b/A09财务通用管理/U_FinTradePlanSel.pas index d3b9b14..09ca558 100644 --- a/A09财务通用管理/U_FinTradePlanSel.pas +++ b/A09财务通用管理/U_FinTradePlanSel.pas @@ -11,7 +11,8 @@ uses cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxCheckBox, - cxCalendar, dxSkinsCore, dxSkinsDefaultPainters, dxScrollbarAnnotations; + cxCalendar, dxSkinsCore, dxSkinsDefaultPainters, dxScrollbarAnnotations, + dxSkinWXI; type TfrmFinTradePlanSel = class(TfrmBaseHelp) diff --git a/A09财务通用管理/U_FinTradeSalesContractSel.dfm b/A09财务通用管理/U_FinTradeSalesContractSel.dfm index 0e4f001..486e97b 100644 --- a/A09财务通用管理/U_FinTradeSalesContractSel.dfm +++ b/A09财务通用管理/U_FinTradeSalesContractSel.dfm @@ -130,6 +130,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel TabOrder = 2 object TV1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> + ScrollbarAnnotations.CustomAnnotations = <> DataController.DataSource = DS_1 DataController.Filter.AutoDataSetFilter = True DataController.Options = [dcoAssignGroupingValues, dcoAssignMasterDetailKeys, dcoSaveExpanding, dcoImmediatePost] @@ -171,6 +172,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object TV1Column7: TcxGridDBColumn Caption = #36873#25321 DataBinding.FieldName = 'SSel' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxCheckBoxProperties' Properties.ImmediatePost = True HeaderAlignmentHorz = taCenter @@ -179,36 +181,42 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object TV1Column1: TcxGridDBColumn Caption = #21512#21516#21495 DataBinding.FieldName = 'ConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV1Column6: TcxGridDBColumn Caption = #23458#25143#21333#21495 DataBinding.FieldName = 'BuyConNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Width = 88 end object TV1Column5: TcxGridDBColumn Caption = #32463#33829#21333#20301 DataBinding.FieldName = 'SellName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV1Column3: TcxGridDBColumn Caption = #23458#25143 DataBinding.FieldName = 'BuyName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object TV1Column4: TcxGridDBColumn Caption = #20013#38388#21830 DataBinding.FieldName = 'MiddleName' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False end object v1Column5: TcxGridDBColumn Caption = #35268#26684 DataBinding.FieldName = 'C_Spec' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 60 @@ -216,6 +224,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object TV1Column2: TcxGridDBColumn Caption = #20132#36135#26085#26399 DataBinding.FieldName = 'DlyDate' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 72 @@ -223,6 +232,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object VC_SCSCode: TcxGridDBColumn Caption = #20135#21697#32534#21495 DataBinding.FieldName = 'C_Code' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -237,6 +247,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object cxGridDBColumn2: TcxGridDBColumn Caption = #20135#21697#21517#31216 DataBinding.FieldName = 'C_Name' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -244,6 +255,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object cxGridDBColumn3: TcxGridDBColumn Caption = #20135#21697#33521#25991#21517 DataBinding.FieldName = 'C_EName' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -258,6 +270,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object cxGridDBColumn4: TcxGridDBColumn Caption = #25104#20998 DataBinding.FieldName = 'C_Composition' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -265,6 +278,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object cxGridDBColumn5: TcxGridDBColumn Caption = #39068#33394 DataBinding.FieldName = 'C_Color' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 @@ -272,6 +286,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object cxGridDBColumn6: TcxGridDBColumn Caption = #33394#21495 DataBinding.FieldName = 'C_ColorNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 57 @@ -279,6 +294,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object cxGridDBColumn7: TcxGridDBColumn Caption = #27454#21495 DataBinding.FieldName = 'C_StyleNo' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 77 @@ -286,6 +302,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object cxGridDBColumn8: TcxGridDBColumn Caption = #33457#22411 DataBinding.FieldName = 'C_Pattern' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -300,6 +317,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object v1Column6: TcxGridDBColumn Caption = #38376#24133 DataBinding.FieldName = 'C_Width' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -313,6 +331,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object v1Column7: TcxGridDBColumn Caption = #20811#37325 DataBinding.FieldName = 'C_GramWeight' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxButtonEditProperties' Properties.Buttons = < item @@ -326,6 +345,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object v1PRTOrderQty: TcxGridDBColumn Caption = #25968#37327 DataBinding.FieldName = 'ConQty' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxTextEditProperties' HeaderAlignmentHorz = taCenter Options.Editing = False @@ -334,6 +354,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object v1OrderUnit: TcxGridDBColumn Caption = #21333#20301 DataBinding.FieldName = 'ConUnit' + DataBinding.IsNullValueType = True PropertiesClassName = 'TcxComboBoxProperties' Properties.DropDownListStyle = lsEditFixedList Properties.Items.Strings = ( @@ -347,6 +368,7 @@ inherited frmFinTradeSalesContractSel: TfrmFinTradeSalesContractSel object v1Column2: TcxGridDBColumn Caption = #22791#27880 DataBinding.FieldName = 'ConSNote' + DataBinding.IsNullValueType = True HeaderAlignmentHorz = taCenter Options.Editing = False Width = 70 diff --git a/A09财务通用管理/U_FinTradeSalesContractSel.pas b/A09财务通用管理/U_FinTradeSalesContractSel.pas index 7ffffac..30bc19c 100644 --- a/A09财务通用管理/U_FinTradeSalesContractSel.pas +++ b/A09财务通用管理/U_FinTradeSalesContractSel.pas @@ -11,7 +11,8 @@ uses cxTextEdit, cxGridCustomPopupMenu, cxGridPopupMenu, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, System.ImageList, U_BaseInput, cxButtonEdit, - cxDropDownEdit, cxCheckBox, Vcl.Menus; + cxDropDownEdit, cxCheckBox, Vcl.Menus, dxSkinsCore, dxSkinWXI, + dxScrollbarAnnotations; type TfrmFinTradeSalesContractSel = class(TfrmBaseHelp) diff --git a/A09财务通用管理/U_GETableBatchInput.dfm b/A09财务通用管理/U_GETableBatchInput.dfm index 66947d8..291693e 100644 --- a/A09财务通用管理/U_GETableBatchInput.dfm +++ b/A09财务通用管理/U_GETableBatchInput.dfm @@ -96,7 +96,6 @@ inherited frmGetableBatchInput: TfrmGetableBatchInput Align = alClient PopupMenu = PM_1 TabOrder = 1 - ExplicitTop = 36 object Tv1: TcxGridDBTableView Navigator.Buttons.CustomButtons = <> Navigator.Buttons.Delete.Enabled = False @@ -118,6 +117,7 @@ inherited frmGetableBatchInput: TfrmGetableBatchInput Kind = skSum end item + Format = '#,###.##' Kind = skSum Column = Tv1TaxInclude end @@ -129,6 +129,7 @@ inherited frmGetableBatchInput: TfrmGetableBatchInput Kind = skSum end item + Format = '#,###.##' Kind = skSum Column = Tv1Tax end> @@ -217,6 +218,13 @@ inherited frmGetableBatchInput: TfrmGetableBatchInput Caption = #22383#24067#21512#21516#21495 DataBinding.FieldName = 'ConNo' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = Tv1ConNoPropertiesButtonClick HeaderAlignmentHorz = taCenter Width = 112 end @@ -297,6 +305,13 @@ inherited frmGetableBatchInput: TfrmGetableBatchInput Caption = #21333#20301 DataBinding.FieldName = 'QtyUnit' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxButtonEditProperties' + Properties.Buttons = < + item + Default = True + Kind = bkEllipsis + end> + Properties.OnButtonClick = Tv1QtyUnitPropertiesButtonClick HeaderAlignmentHorz = taCenter Width = 63 end @@ -318,7 +333,8 @@ inherited frmGetableBatchInput: TfrmGetableBatchInput Caption = #19981#21547#31246#21333#20215 DataBinding.FieldName = 'NoTaxPrice' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DisplayFormat = '#,###.##' Properties.OnEditValueChanged = Tv1TaxRatePropertiesEditValueChanged HeaderAlignmentHorz = taCenter Width = 99 @@ -327,6 +343,8 @@ inherited frmGetableBatchInput: TfrmGetableBatchInput Caption = #19981#21547#31246#37329#39069 DataBinding.FieldName = 'NoTaxInclude' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DisplayFormat = '#,###.##' HeaderAlignmentHorz = taCenter Width = 123 end @@ -343,7 +361,8 @@ inherited frmGetableBatchInput: TfrmGetableBatchInput Caption = #31246#39069 DataBinding.FieldName = 'Tax' DataBinding.IsNullValueType = True - PropertiesClassName = 'TcxTextEditProperties' + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DisplayFormat = '#,###.##' HeaderAlignmentHorz = taCenter Width = 85 end @@ -351,6 +370,8 @@ inherited frmGetableBatchInput: TfrmGetableBatchInput Caption = #21547#31246#37329#39069 DataBinding.FieldName = 'TaxInclude' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DisplayFormat = '#,###.##' HeaderAlignmentHorz = taCenter Width = 96 end diff --git a/A09财务通用管理/U_GETableBatchInput.pas b/A09财务通用管理/U_GETableBatchInput.pas index 1070115..2edfe49 100644 --- a/A09财务通用管理/U_GETableBatchInput.pas +++ b/A09财务通用管理/U_GETableBatchInput.pas @@ -85,6 +85,10 @@ type procedure Tv1CurrencyPropertiesChange(Sender: TObject); procedure Tv1TaxRatePropertiesEditValueChanged(Sender: TObject); procedure TV1OurCoNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); + procedure Tv1QtyUnitPropertiesButtonClick(Sender: TObject; + AButtonIndex: Integer); + procedure Tv1ConNoPropertiesButtonClick(Sender: TObject; + AButtonIndex: Integer); private { Private declarations } function SaveData(): Boolean; @@ -102,7 +106,7 @@ implementation uses U_DataLink, U_RTFun, U_ZDYHelp, U_CompanySel, U_FinTradePlanSel, - U_FinPurchasePlanSel; + U_FinPurchasePlanSel,U_FinTradeSalesContractSel; {$R *.dfm} @@ -273,6 +277,8 @@ begin CDS_1.FieldByName('FFTime').Value := SGetServerDateTime(ADOQueryCmd); CDS_1.FieldByName('ReconciliationDate').Value := SGetServerDate(ADOQueryCmd); CDS_1.FieldByName('OurCoName').Value := 'DESHINE VIETNAM CO., LTD'; + CDS_1.FieldByName('ourShuiNo').Value := '1102083046'; + CDS_1.FieldByName('QtyUnit').Value := 'M'; CDS_1.FieldByName('SSel').Value := False; CDS_1.Post; end; @@ -502,6 +508,39 @@ begin end; +procedure TfrmGetableBatchInput.Tv1ConNoPropertiesButtonClick(Sender: TObject; + AButtonIndex: Integer); +begin + inherited; + try + frmFinTradeSalesContractSel := TfrmFinTradeSalesContractSel.Create(Application); + with frmFinTradeSalesContractSel do + begin + if ShowModal = 1 then + begin + with Self.CDS_1 do + begin + if not (State in [dsEdit, dsInsert]) then + Edit; + + FieldByName('ConNo').AsString := Trim(CDS_1.FieldByName('ConNo').AsString); + FieldByName('ConMId').AsString := Trim(CDS_1.FieldByName('ConMId').AsString); + FieldByName('ConSId').AsString := Trim(CDS_1.FieldByName('ConSId').AsString); + + FieldByName('BuyConNo').AsString := Trim(CDS_1.fieldbyname('BuyConNo').AsString); + FieldByName('BuyConMID').AsString := Trim(CDS_1.fieldbyname('FROMCPMID').AsString); + FieldByName('BuyConSID').AsString := Trim(CDS_1.fieldbyname('FROMCPSID').AsString); + + Post; + end; + end; + end; + finally + frmFinTradeSalesContractSel.Free; + end; +end; + + procedure TfrmGetableBatchInput.Tv1CurrencyPropertiesChange(Sender: TObject); var mvalue, FFieldName: string; @@ -633,6 +672,7 @@ begin // end; end; + procedure TfrmGetableBatchInput.Tv1OppCoNamePropertiesButtonClick(Sender: TObject; AButtonIndex: Integer); begin try @@ -664,6 +704,8 @@ begin begin with frmFinTradePlanSel.CDS_1 do begin + if not (Self.CDS_1.State in [dsEdit, dsInsert]) then + Self.CDS_1.Edit; //ɹ self.CDS_1.FieldByName('PurNo').value := null; self.CDS_1.FieldByName('PurMID').value := null; @@ -802,6 +844,28 @@ begin end; end; +procedure TfrmGetableBatchInput.Tv1QtyUnitPropertiesButtonClick(Sender: TObject; + AButtonIndex: Integer); +begin + try + frmZDYHelp := TfrmZDYHelp.Create(Application); + with frmZDYHelp do + begin + flag := 'QtyUnit2'; + flagname := 'λ'; + if ShowModal = 1 then + begin + Self.CDS_1.Edit; + Self.CDS_1.FieldByName('QtyUnit').Value := Trim(ClientDataSet1.fieldbyname('ZDYName').AsString); + Self.CDS_1.Post; + end; + end; + finally + frmZDYHelp.Free; + end; + +end; + procedure TfrmGetableBatchInput.Tv1TaxRatePropertiesEditValueChanged(Sender: TObject); var mvalue, FFieldName: string; diff --git a/A09财务通用管理/U_InvoiceOutSel.dfm b/A09财务通用管理/U_InvoiceOutSel.dfm index ee1a5a0..3379c76 100644 --- a/A09财务通用管理/U_InvoiceOutSel.dfm +++ b/A09财务通用管理/U_InvoiceOutSel.dfm @@ -321,8 +321,8 @@ object frmInvoiceOutSel: TfrmInvoiceOutSel Properties.Style = 11 Properties.TabIndex = 0 Properties.Tabs.Strings = ( - ' '#26410#30003#35831' ' - ' '#24050#30003#35831' ' + ' '#26410#25910#27454' ' + ' '#24050#25910#27454' ' ' '#20840#37096' ') LookAndFeel.Kind = lfUltraFlat OnChange = cxTabControl1Change diff --git a/A09财务通用管理/U_InvoiceOutSel.pas b/A09财务通用管理/U_InvoiceOutSel.pas index 9d82f22..af95dab 100644 --- a/A09财务通用管理/U_InvoiceOutSel.pas +++ b/A09财务通用管理/U_InvoiceOutSel.pas @@ -293,6 +293,10 @@ end; procedure TfrmInvoiceOutSel.TbsselClick(Sender: TObject); begin + if cxTabControl1.TabIndex <> 0 then + begin + Exit; + end; if CDS_Invoice.IsEmpty then begin Exit; @@ -314,6 +318,7 @@ begin end; Enddate.Date := SGetServerDate(ADOQueryTmp); begdate.Date := Enddate.Date - 30; + Tbssel.Visible := (cxTabControl1.TabIndex = 0); initGrid(); end; @@ -607,6 +612,10 @@ end; procedure TfrmInvoiceOutSel.Tv1DblClick(Sender: TObject); begin + if cxTabControl1.TabIndex <> 0 then + begin + Exit; + end; ModalResult := 1; end; diff --git a/A09财务通用管理/U_ReceivableInput.dfm b/A09财务通用管理/U_ReceivableInput.dfm index abcb2cf..c81c596 100644 --- a/A09财务通用管理/U_ReceivableInput.dfm +++ b/A09财务通用管理/U_ReceivableInput.dfm @@ -34,7 +34,6 @@ object frmReceivableInput: TfrmReceivableInput ParentColor = False ShowCaptions = True TabOrder = 0 - ExplicitTop = -6 object ToolButton3: TToolButton Left = 0 Top = 0 diff --git a/A09财务通用管理/U_ReceivableInput.pas b/A09财务通用管理/U_ReceivableInput.pas index 94b9ba7..dde2a67 100644 --- a/A09财务通用管理/U_ReceivableInput.pas +++ b/A09财务通用管理/U_ReceivableInput.pas @@ -15,7 +15,7 @@ uses cxTextEdit, cxDropDownEdit, BtnEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxDateRanges, dxBarBuiltInMenu, U_BaseList, cxContainer, cxCurrencyEdit, dxSkinsCore, - dxSkinsDefaultPainters; + dxSkinsDefaultPainters, dxSkinWXI; type TfrmReceivableInput = class(TForm) diff --git a/A09财务通用管理/U_ReceivableList.dfm b/A09财务通用管理/U_ReceivableList.dfm index cd2de54..7d3d56d 100644 --- a/A09财务通用管理/U_ReceivableList.dfm +++ b/A09财务通用管理/U_ReceivableList.dfm @@ -7,6 +7,7 @@ inherited frmReceivableList: TfrmReceivableList Font.Height = -16 FormStyle = fsMDIChild Visible = True + ExplicitLeft = -181 ExplicitWidth = 1556 ExplicitHeight = 629 PixelsPerInch = 96 @@ -320,6 +321,7 @@ inherited frmReceivableList: TfrmReceivableList Kind = skSum end item + Format = '#,###.##' Kind = skSum Column = Tv1TaxInclude end @@ -502,6 +504,8 @@ inherited frmReceivableList: TfrmReceivableList Caption = #19981#21547#31246#21333#20215 DataBinding.FieldName = 'NoTaxPrice' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DisplayFormat = '#,###.##' HeaderAlignmentHorz = taCenter Width = 99 end @@ -516,6 +520,8 @@ inherited frmReceivableList: TfrmReceivableList Caption = #31246#39069 DataBinding.FieldName = 'Tax' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DisplayFormat = '#,###.##' HeaderAlignmentHorz = taCenter Width = 71 end @@ -523,6 +529,8 @@ inherited frmReceivableList: TfrmReceivableList Caption = #21547#31246#37329#39069 DataBinding.FieldName = 'TaxInclude' DataBinding.IsNullValueType = True + PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.DisplayFormat = '#,###.##' HeaderAlignmentHorz = taCenter Options.Editing = False Width = 96 diff --git a/A09财务通用管理/U_ReceivableList.pas b/A09财务通用管理/U_ReceivableList.pas index 1edae39..305861b 100644 --- a/A09财务通用管理/U_ReceivableList.pas +++ b/A09财务通用管理/U_ReceivableList.pas @@ -15,7 +15,8 @@ uses cxTextEdit, cxPC, cxDropDownEdit, cxLookAndFeels, cxLookAndFeelPainters, cxNavigator, dxBarBuiltInMenu, dxDateRanges, U_BaseList, Vcl.Menus, Vcl.Clipbrd, cxContainer, dxCore, cxDateUtils, dxSkinsCore, - dxSkinsDefaultPainters, dxScrollbarAnnotations, cxProgressBar, dxSkinWXI; + dxSkinsDefaultPainters, dxScrollbarAnnotations, cxProgressBar, dxSkinWXI, + cxCurrencyEdit; type TfrmReceivableList = class(TfrmBaseList)