dev前台代码
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
lu
6 天以前 e72f34545b96332b8bff76294b7d397630139d9c 
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs


@@ -152,12 +152,19 @@


            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();


<<<<<<< HEAD


            this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();


            this.picCheckBox = new System.Windows.Forms.PictureBox();


            this.tips = new DevExpress.Utils.ToolTipController(this.components);


            this.ucRptCgdhd1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhd();


=======


            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();


            this.picCheckBox = new System.Windows.Forms.PictureBox();


            this.tips = new DevExpress.Utils.ToolTipController(this.components);


            this.txt_mxStatue = new DevExpress.XtraEditors.TextEdit();


            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();


            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();


>>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1


            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();


            this.xtraTabControl1.SuspendLayout();


            this.xtraTabPage1.SuspendLayout();


@@ -213,6 +220,7 @@


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit();


            this.xtraTabPageReport.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_mxStatue.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();


@@ -247,7 +255,8 @@


            this.xtraTabControl1.TabIndex = 3;


            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {


            this.xtraTabPage1,


            this.xtraTabPage2});


            this.xtraTabPage2,


            this.xtraTabPageReport});


            // 


            // xtraTabPage1


            // 


@@ -1489,6 +1498,14 @@


            this.gridColumn21.VisibleIndex = 20;


            this.gridColumn21.Width = 94;


            // 


            // xtraTabPageReport


            // 


            this.xtraTabPageReport.Controls.Add(this.ucRptCgdhd1);


            this.xtraTabPageReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;


            this.xtraTabPageReport.Name = "xtraTabPageReport";


            this.xtraTabPageReport.Size = new System.Drawing.Size(1573, 570);


            this.xtraTabPageReport.Text = "报表";


            // 


            // picCheckBox


            // 


            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;


@@ -1501,6 +1518,15 @@


            this.picCheckBox.TabStop = false;


            this.picCheckBox.Visible = false;


            // 


<<<<<<< HEAD


            // ucRptCgdhd1


            // 


            this.ucRptCgdhd1.Dock = System.Windows.Forms.DockStyle.Fill;


            this.ucRptCgdhd1.Location = new System.Drawing.Point(0, 0);


            this.ucRptCgdhd1.Name = "ucRptCgdhd1";


            this.ucRptCgdhd1.Size = new System.Drawing.Size(1573, 570);


            this.ucRptCgdhd1.TabIndex = 0;


=======


            // txt_mxStatue


            // 


            this.txt_mxStatue.Location = new System.Drawing.Point(600, 132);


@@ -1532,6 +1558,7 @@


            this.layoutControlItem2.Size = new System.Drawing.Size(486, 40);


            this.layoutControlItem2.Text = "到货单号";


            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);


>>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1


            // 


            // Frm_MesInvItemArn


            // 


@@ -1599,6 +1626,7 @@


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit();


            this.xtraTabPageReport.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_mxStatue.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();


@@ -1707,10 +1735,15 @@


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;


<<<<<<< HEAD


        private DevExpress.XtraTab.XtraTabPage xtraTabPageReport;


        private Rpt.UcRptCgdhd ucRptCgdhd1;


=======


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;


        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;


        private DevExpress.XtraEditors.TextEdit txt_mxStatue;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;


        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;


>>>>>>> 32e0a92a0c603db872d56739299cb7f603b23dd1


    }


}