chenxy hace 6 años
padre
commit
8f82e44ecd

+ 146 - 159
DK.Client/Client.Controls/Layout/F_MST_012001.designer.cs

@@ -39,8 +39,17 @@
             this.txtInvoiceName = new Dongke.WinForm.Controls.TxtTextBox();
             this.txtInvoiceName = new Dongke.WinForm.Controls.TxtTextBox();
             this.lblInvoiceLayoutName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.lblInvoiceLayoutName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.dgvInvoice = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
             this.dgvInvoice = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
+            this.LayoutName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.goodstypename = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.logonamecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PrintTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colHeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colWidth = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ValueFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.InvoiceLayoutID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.goodstypecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.gbxCondition = new System.Windows.Forms.GroupBox();
             this.gbxCondition = new System.Windows.Forms.GroupBox();
-            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
             this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.ckcLogo = new Dongke.WinForm.Controls.CkcCheckedComboBox();
             this.ckcLogo = new Dongke.WinForm.Controls.CkcCheckedComboBox();
             this.chkValueFlag = new Dongke.WinForm.Controls.ChkFlagCheckBox();
             this.chkValueFlag = new Dongke.WinForm.Controls.ChkFlagCheckBox();
@@ -61,16 +70,7 @@
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
             this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
             this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
             this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
-            this.LayoutName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.goodstypename = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.logonamecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.PrintTypeName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colHeight = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.colWidth = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ValueFlag = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.InvoiceLayoutID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.goodstypecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
             ((System.ComponentModel.ISupportInitialize)(this.dgvInvoice)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvInvoice)).BeginInit();
             this.gbxCondition.SuspendLayout();
             this.gbxCondition.SuspendLayout();
             this.tsrSupplier.SuspendLayout();
             this.tsrSupplier.SuspendLayout();
@@ -79,11 +79,10 @@
             // txtRemarks
             // txtRemarks
             // 
             // 
             this.txtRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtRemarks.Location = new System.Drawing.Point(803, 25);
-            this.txtRemarks.Margin = new System.Windows.Forms.Padding(4);
+            this.txtRemarks.Location = new System.Drawing.Point(602, 20);
             this.txtRemarks.Name = "txtRemarks";
             this.txtRemarks.Name = "txtRemarks";
             this.txtRemarks.ScrollBars = System.Windows.Forms.ScrollBars.Both;
             this.txtRemarks.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.txtRemarks.Size = new System.Drawing.Size(233, 25);
+            this.txtRemarks.Size = new System.Drawing.Size(176, 21);
             this.txtRemarks.TabIndex = 7;
             this.txtRemarks.TabIndex = 7;
             // 
             // 
             // lblRemarks
             // lblRemarks
@@ -92,20 +91,18 @@
             this.lblRemarks.BackColor = System.Drawing.Color.Transparent;
             this.lblRemarks.BackColor = System.Drawing.Color.Transparent;
             this.lblRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblRemarks.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblRemarks.ForeColor = System.Drawing.SystemColors.ControlText;
             this.lblRemarks.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblRemarks.Location = new System.Drawing.Point(756, 30);
-            this.lblRemarks.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblRemarks.Location = new System.Drawing.Point(567, 24);
             this.lblRemarks.Name = "lblRemarks";
             this.lblRemarks.Name = "lblRemarks";
-            this.lblRemarks.Size = new System.Drawing.Size(37, 15);
+            this.lblRemarks.Size = new System.Drawing.Size(29, 12);
             this.lblRemarks.TabIndex = 5;
             this.lblRemarks.TabIndex = 5;
             this.lblRemarks.Text = "备注";
             this.lblRemarks.Text = "备注";
             // 
             // 
             // txtInvoiceName
             // txtInvoiceName
             // 
             // 
             this.txtInvoiceName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtInvoiceName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtInvoiceName.Location = new System.Drawing.Point(95, 25);
-            this.txtInvoiceName.Margin = new System.Windows.Forms.Padding(4);
+            this.txtInvoiceName.Location = new System.Drawing.Point(71, 20);
             this.txtInvoiceName.Name = "txtInvoiceName";
             this.txtInvoiceName.Name = "txtInvoiceName";
-            this.txtInvoiceName.Size = new System.Drawing.Size(159, 25);
+            this.txtInvoiceName.Size = new System.Drawing.Size(120, 21);
             this.txtInvoiceName.TabIndex = 1;
             this.txtInvoiceName.TabIndex = 1;
             // 
             // 
             // lblInvoiceLayoutName
             // lblInvoiceLayoutName
@@ -114,10 +111,9 @@
             this.lblInvoiceLayoutName.BackColor = System.Drawing.Color.Transparent;
             this.lblInvoiceLayoutName.BackColor = System.Drawing.Color.Transparent;
             this.lblInvoiceLayoutName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblInvoiceLayoutName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblInvoiceLayoutName.ForeColor = System.Drawing.SystemColors.ControlText;
             this.lblInvoiceLayoutName.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblInvoiceLayoutName.Location = new System.Drawing.Point(16, 30);
-            this.lblInvoiceLayoutName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblInvoiceLayoutName.Location = new System.Drawing.Point(12, 24);
             this.lblInvoiceLayoutName.Name = "lblInvoiceLayoutName";
             this.lblInvoiceLayoutName.Name = "lblInvoiceLayoutName";
-            this.lblInvoiceLayoutName.Size = new System.Drawing.Size(67, 15);
+            this.lblInvoiceLayoutName.Size = new System.Drawing.Size(53, 12);
             this.lblInvoiceLayoutName.TabIndex = 0;
             this.lblInvoiceLayoutName.TabIndex = 0;
             this.lblInvoiceLayoutName.Text = "模板名称";
             this.lblInvoiceLayoutName.Text = "模板名称";
             // 
             // 
@@ -174,8 +170,7 @@
             this.dgvInvoice.IsOpenMergeCellFlag = false;
             this.dgvInvoice.IsOpenMergeCellFlag = false;
             this.dgvInvoice.IsSubTotalFlag = false;
             this.dgvInvoice.IsSubTotalFlag = false;
             this.dgvInvoice.IsTopDeep = false;
             this.dgvInvoice.IsTopDeep = false;
-            this.dgvInvoice.Location = new System.Drawing.Point(0, 119);
-            this.dgvInvoice.Margin = new System.Windows.Forms.Padding(4);
+            this.dgvInvoice.Location = new System.Drawing.Point(0, 95);
             this.dgvInvoice.MergeColumnNames = null;
             this.dgvInvoice.MergeColumnNames = null;
             this.dgvInvoice.MergeDetailColumnNames = null;
             this.dgvInvoice.MergeDetailColumnNames = null;
             this.dgvInvoice.MergeDetailOnlyColumn = null;
             this.dgvInvoice.MergeDetailOnlyColumn = null;
@@ -191,7 +186,7 @@
             this.dgvInvoice.RowsDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvInvoice.RowsDefaultCellStyle = dataGridViewCellStyle5;
             this.dgvInvoice.RowTemplate.Height = 21;
             this.dgvInvoice.RowTemplate.Height = 21;
             this.dgvInvoice.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dgvInvoice.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvInvoice.Size = new System.Drawing.Size(1292, 580);
+            this.dgvInvoice.Size = new System.Drawing.Size(969, 464);
             this.dgvInvoice.SortOrderColumnName = null;
             this.dgvInvoice.SortOrderColumnName = null;
             this.dgvInvoice.TabIndex = 2;
             this.dgvInvoice.TabIndex = 2;
             this.dgvInvoice.Tag = true;
             this.dgvInvoice.Tag = true;
@@ -201,6 +196,107 @@
             this.dgvInvoice.SelectionChanged += new System.EventHandler(this.dgvInvoice_SelectionChanged);
             this.dgvInvoice.SelectionChanged += new System.EventHandler(this.dgvInvoice_SelectionChanged);
             this.dgvInvoice.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dgvInvoice_KeyDown);
             this.dgvInvoice.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dgvInvoice_KeyDown);
             // 
             // 
+            // LayoutName
+            // 
+            this.LayoutName.DataPropertyName = "LayoutName";
+            this.LayoutName.HeaderText = "模板名称";
+            this.LayoutName.MinimumWidth = 6;
+            this.LayoutName.Name = "LayoutName";
+            this.LayoutName.ReadOnly = true;
+            this.LayoutName.Width = 150;
+            // 
+            // goodstypename
+            // 
+            this.goodstypename.DataPropertyName = "goodstypename";
+            this.goodstypename.HeaderText = "产品类别";
+            this.goodstypename.MinimumWidth = 6;
+            this.goodstypename.Name = "goodstypename";
+            this.goodstypename.ReadOnly = true;
+            this.goodstypename.Width = 125;
+            // 
+            // logonamecode
+            // 
+            this.logonamecode.DataPropertyName = "logonamecode";
+            this.logonamecode.HeaderText = "产品商标";
+            this.logonamecode.MinimumWidth = 6;
+            this.logonamecode.Name = "logonamecode";
+            this.logonamecode.ReadOnly = true;
+            this.logonamecode.Width = 125;
+            // 
+            // PrintTypeName
+            // 
+            this.PrintTypeName.DataPropertyName = "PrintTypeName";
+            this.PrintTypeName.HeaderText = "打印类别";
+            this.PrintTypeName.MinimumWidth = 6;
+            this.PrintTypeName.Name = "PrintTypeName";
+            this.PrintTypeName.ReadOnly = true;
+            this.PrintTypeName.Width = 125;
+            // 
+            // colHeight
+            // 
+            this.colHeight.DataPropertyName = "Height";
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle3.Format = "#,###.00";
+            this.colHeight.DefaultCellStyle = dataGridViewCellStyle3;
+            this.colHeight.HeaderText = "纸张高度(mm)";
+            this.colHeight.MinimumWidth = 6;
+            this.colHeight.Name = "colHeight";
+            this.colHeight.ReadOnly = true;
+            this.colHeight.Width = 125;
+            // 
+            // colWidth
+            // 
+            this.colWidth.DataPropertyName = "Width";
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle4.Format = "#,###.00";
+            this.colWidth.DefaultCellStyle = dataGridViewCellStyle4;
+            this.colWidth.HeaderText = "纸张宽度(mm)";
+            this.colWidth.MinimumWidth = 6;
+            this.colWidth.Name = "colWidth";
+            this.colWidth.ReadOnly = true;
+            this.colWidth.Width = 125;
+            // 
+            // Remarks
+            // 
+            this.Remarks.DataPropertyName = "Remarks";
+            this.Remarks.HeaderText = "备注";
+            this.Remarks.MinimumWidth = 6;
+            this.Remarks.Name = "Remarks";
+            this.Remarks.ReadOnly = true;
+            this.Remarks.Width = 170;
+            // 
+            // ValueFlag
+            // 
+            this.ValueFlag.DataPropertyName = "ValueFlag";
+            this.ValueFlag.FalseValue = "0";
+            this.ValueFlag.HeaderText = "有效标识";
+            this.ValueFlag.MinimumWidth = 6;
+            this.ValueFlag.Name = "ValueFlag";
+            this.ValueFlag.ReadOnly = true;
+            this.ValueFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.ValueFlag.TrueValue = "1";
+            this.ValueFlag.Width = 125;
+            // 
+            // InvoiceLayoutID
+            // 
+            this.InvoiceLayoutID.DataPropertyName = "LayoutID";
+            this.InvoiceLayoutID.HeaderText = "票据格式ID";
+            this.InvoiceLayoutID.MinimumWidth = 6;
+            this.InvoiceLayoutID.Name = "InvoiceLayoutID";
+            this.InvoiceLayoutID.ReadOnly = true;
+            this.InvoiceLayoutID.Visible = false;
+            this.InvoiceLayoutID.Width = 125;
+            // 
+            // goodstypecode
+            // 
+            this.goodstypecode.DataPropertyName = "goodstypecode";
+            this.goodstypecode.HeaderText = "产品类别编码";
+            this.goodstypecode.MinimumWidth = 6;
+            this.goodstypecode.Name = "goodstypecode";
+            this.goodstypecode.ReadOnly = true;
+            this.goodstypecode.Visible = false;
+            this.goodstypecode.Width = 125;
+            // 
             // gbxCondition
             // gbxCondition
             // 
             // 
             this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             this.gbxCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
@@ -218,35 +314,22 @@
             this.gbxCondition.Controls.Add(this.lblInvoiceLayoutName);
             this.gbxCondition.Controls.Add(this.lblInvoiceLayoutName);
             this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.gbxCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
             this.gbxCondition.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.gbxCondition.Location = new System.Drawing.Point(0, 50);
-            this.gbxCondition.Margin = new System.Windows.Forms.Padding(4);
+            this.gbxCondition.Location = new System.Drawing.Point(0, 40);
             this.gbxCondition.Name = "gbxCondition";
             this.gbxCondition.Name = "gbxCondition";
-            this.gbxCondition.Padding = new System.Windows.Forms.Padding(4);
-            this.gbxCondition.Size = new System.Drawing.Size(1288, 61);
+            this.gbxCondition.Size = new System.Drawing.Size(966, 49);
             this.gbxCondition.TabIndex = 1;
             this.gbxCondition.TabIndex = 1;
             this.gbxCondition.TabStop = false;
             this.gbxCondition.TabStop = false;
             this.gbxCondition.Text = "查询条件";
             this.gbxCondition.Text = "查询条件";
             // 
             // 
-            // scbGoodsType
-            // 
-            this.scbGoodsType.CheckedData = null;
-            this.scbGoodsType.IsOnlyDisplayEnd = false;
-            this.scbGoodsType.Location = new System.Drawing.Point(341, 25);
-            this.scbGoodsType.Margin = new System.Windows.Forms.Padding(4);
-            this.scbGoodsType.Name = "scbGoodsType";
-            this.scbGoodsType.Size = new System.Drawing.Size(160, 26);
-            this.scbGoodsType.TabIndex = 23;
-            // 
             // lblGoodsType
             // lblGoodsType
             // 
             // 
             this.lblGoodsType.AutoSize = true;
             this.lblGoodsType.AutoSize = true;
             this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
             this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
             this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGoodsType.ForeColor = System.Drawing.SystemColors.ControlText;
             this.lblGoodsType.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblGoodsType.Location = new System.Drawing.Point(263, 30);
-            this.lblGoodsType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGoodsType.Location = new System.Drawing.Point(197, 24);
             this.lblGoodsType.Name = "lblGoodsType";
             this.lblGoodsType.Name = "lblGoodsType";
-            this.lblGoodsType.Size = new System.Drawing.Size(67, 15);
+            this.lblGoodsType.Size = new System.Drawing.Size(53, 12);
             this.lblGoodsType.TabIndex = 22;
             this.lblGoodsType.TabIndex = 22;
             this.lblGoodsType.Text = "产品类别";
             this.lblGoodsType.Text = "产品类别";
             // 
             // 
@@ -254,27 +337,24 @@
             // 
             // 
             this.ckcLogo.FormattingEnabled = true;
             this.ckcLogo.FormattingEnabled = true;
             this.ckcLogo.HasNullData = true;
             this.ckcLogo.HasNullData = true;
-            this.ckcLogo.Location = new System.Drawing.Point(588, 25);
-            this.ckcLogo.Margin = new System.Windows.Forms.Padding(4);
+            this.ckcLogo.Location = new System.Drawing.Point(441, 20);
             this.ckcLogo.Name = "ckcLogo";
             this.ckcLogo.Name = "ckcLogo";
-            this.ckcLogo.Size = new System.Drawing.Size(159, 23);
+            this.ckcLogo.Size = new System.Drawing.Size(120, 20);
             this.ckcLogo.TabIndex = 4;
             this.ckcLogo.TabIndex = 4;
             // 
             // 
             // chkValueFlag
             // chkValueFlag
             // 
             // 
             this.chkValueFlag.FlagBoxChecked = Dongke.WinForm.Controls.FlagCheckBoxChecked.All;
             this.chkValueFlag.FlagBoxChecked = Dongke.WinForm.Controls.FlagCheckBoxChecked.All;
-            this.chkValueFlag.Location = new System.Drawing.Point(1124, 29);
-            this.chkValueFlag.Margin = new System.Windows.Forms.Padding(4);
+            this.chkValueFlag.Location = new System.Drawing.Point(843, 23);
             this.chkValueFlag.Name = "chkValueFlag";
             this.chkValueFlag.Name = "chkValueFlag";
-            this.chkValueFlag.Size = new System.Drawing.Size(88, 19);
+            this.chkValueFlag.Size = new System.Drawing.Size(72, 16);
             this.chkValueFlag.TabIndex = 9;
             this.chkValueFlag.TabIndex = 9;
             // 
             // 
             // lblValueFlag
             // lblValueFlag
             // 
             // 
-            this.lblValueFlag.Location = new System.Drawing.Point(1045, 30);
-            this.lblValueFlag.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblValueFlag.Location = new System.Drawing.Point(784, 24);
             this.lblValueFlag.Name = "lblValueFlag";
             this.lblValueFlag.Name = "lblValueFlag";
-            this.lblValueFlag.Size = new System.Drawing.Size(67, 15);
+            this.lblValueFlag.Size = new System.Drawing.Size(53, 12);
             this.lblValueFlag.TabIndex = 8;
             this.lblValueFlag.TabIndex = 8;
             this.lblValueFlag.Text = "有效标识";
             this.lblValueFlag.Text = "有效标识";
             // 
             // 
@@ -284,10 +364,9 @@
             this.c_Label1.BackColor = System.Drawing.Color.Transparent;
             this.c_Label1.BackColor = System.Drawing.Color.Transparent;
             this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_Label1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.c_Label1.ForeColor = System.Drawing.SystemColors.ControlText;
             this.c_Label1.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.c_Label1.Location = new System.Drawing.Point(509, 30);
-            this.c_Label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.c_Label1.Location = new System.Drawing.Point(382, 24);
             this.c_Label1.Name = "c_Label1";
             this.c_Label1.Name = "c_Label1";
-            this.c_Label1.Size = new System.Drawing.Size(67, 15);
+            this.c_Label1.Size = new System.Drawing.Size(53, 12);
             this.c_Label1.TabIndex = 3;
             this.c_Label1.TabIndex = 3;
             this.c_Label1.Text = "产品商标";
             this.c_Label1.Text = "产品商标";
             // 
             // 
@@ -312,7 +391,7 @@
             this.tsbtnClose});
             this.tsbtnClose});
             this.tsrSupplier.Location = new System.Drawing.Point(0, 0);
             this.tsrSupplier.Location = new System.Drawing.Point(0, 0);
             this.tsrSupplier.Name = "tsrSupplier";
             this.tsrSupplier.Name = "tsrSupplier";
-            this.tsrSupplier.Size = new System.Drawing.Size(1292, 44);
+            this.tsrSupplier.Size = new System.Drawing.Size(969, 35);
             this.tsrSupplier.TabIndex = 3;
             this.tsrSupplier.TabIndex = 3;
             this.tsrSupplier.Text = "tsrToolStrip1";
             this.tsrSupplier.Text = "tsrToolStrip1";
             // 
             // 
@@ -458,117 +537,25 @@
             this.tsbtnClose.Text = "关闭(&X)";
             this.tsbtnClose.Text = "关闭(&X)";
             this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
             this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
             // 
             // 
-            // LayoutName
-            // 
-            this.LayoutName.DataPropertyName = "LayoutName";
-            this.LayoutName.HeaderText = "模板名称";
-            this.LayoutName.MinimumWidth = 6;
-            this.LayoutName.Name = "LayoutName";
-            this.LayoutName.ReadOnly = true;
-            this.LayoutName.Width = 150;
-            // 
-            // goodstypename
-            // 
-            this.goodstypename.DataPropertyName = "goodstypename";
-            this.goodstypename.HeaderText = "产品类别";
-            this.goodstypename.MinimumWidth = 6;
-            this.goodstypename.Name = "goodstypename";
-            this.goodstypename.ReadOnly = true;
-            this.goodstypename.Width = 125;
-            // 
-            // logonamecode
-            // 
-            this.logonamecode.DataPropertyName = "logonamecode";
-            this.logonamecode.HeaderText = "产品商标";
-            this.logonamecode.MinimumWidth = 6;
-            this.logonamecode.Name = "logonamecode";
-            this.logonamecode.ReadOnly = true;
-            this.logonamecode.Width = 125;
-            // 
-            // PrintTypeName
-            // 
-            this.PrintTypeName.DataPropertyName = "PrintTypeName";
-            this.PrintTypeName.HeaderText = "打印类别";
-            this.PrintTypeName.MinimumWidth = 6;
-            this.PrintTypeName.Name = "PrintTypeName";
-            this.PrintTypeName.ReadOnly = true;
-            this.PrintTypeName.Width = 125;
-            // 
-            // colHeight
-            // 
-            this.colHeight.DataPropertyName = "Height";
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle3.Format = "#,###.00";
-            this.colHeight.DefaultCellStyle = dataGridViewCellStyle3;
-            this.colHeight.HeaderText = "纸张高度(mm)";
-            this.colHeight.MinimumWidth = 6;
-            this.colHeight.Name = "colHeight";
-            this.colHeight.ReadOnly = true;
-            this.colHeight.Width = 125;
-            // 
-            // colWidth
-            // 
-            this.colWidth.DataPropertyName = "Width";
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle4.Format = "#,###.00";
-            this.colWidth.DefaultCellStyle = dataGridViewCellStyle4;
-            this.colWidth.HeaderText = "纸张宽度(mm)";
-            this.colWidth.MinimumWidth = 6;
-            this.colWidth.Name = "colWidth";
-            this.colWidth.ReadOnly = true;
-            this.colWidth.Width = 125;
-            // 
-            // Remarks
-            // 
-            this.Remarks.DataPropertyName = "Remarks";
-            this.Remarks.HeaderText = "备注";
-            this.Remarks.MinimumWidth = 6;
-            this.Remarks.Name = "Remarks";
-            this.Remarks.ReadOnly = true;
-            this.Remarks.Width = 170;
-            // 
-            // ValueFlag
-            // 
-            this.ValueFlag.DataPropertyName = "ValueFlag";
-            this.ValueFlag.FalseValue = "0";
-            this.ValueFlag.HeaderText = "有效标识";
-            this.ValueFlag.MinimumWidth = 6;
-            this.ValueFlag.Name = "ValueFlag";
-            this.ValueFlag.ReadOnly = true;
-            this.ValueFlag.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.ValueFlag.TrueValue = "1";
-            this.ValueFlag.Width = 125;
-            // 
-            // InvoiceLayoutID
-            // 
-            this.InvoiceLayoutID.DataPropertyName = "LayoutID";
-            this.InvoiceLayoutID.HeaderText = "票据格式ID";
-            this.InvoiceLayoutID.MinimumWidth = 6;
-            this.InvoiceLayoutID.Name = "InvoiceLayoutID";
-            this.InvoiceLayoutID.ReadOnly = true;
-            this.InvoiceLayoutID.Visible = false;
-            this.InvoiceLayoutID.Width = 125;
-            // 
-            // goodstypecode
+            // scbGoodsType
             // 
             // 
-            this.goodstypecode.DataPropertyName = "goodstypecode";
-            this.goodstypecode.HeaderText = "产品类别编码";
-            this.goodstypecode.MinimumWidth = 6;
-            this.goodstypecode.Name = "goodstypecode";
-            this.goodstypecode.ReadOnly = true;
-            this.goodstypecode.Visible = false;
-            this.goodstypecode.Width = 125;
+            this.scbGoodsType.CheckedData = null;
+            this.scbGoodsType.IsOnlyDisplayEnd = false;
+            this.scbGoodsType.Location = new System.Drawing.Point(256, 20);
+            this.scbGoodsType.Name = "scbGoodsType";
+            this.scbGoodsType.Size = new System.Drawing.Size(120, 21);
+            this.scbGoodsType.TabIndex = 23;
             // 
             // 
             // F_MST_012001
             // F_MST_012001
             // 
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1292, 702);
+            this.ClientSize = new System.Drawing.Size(969, 562);
             this.Controls.Add(this.tsrSupplier);
             this.Controls.Add(this.tsrSupplier);
             this.Controls.Add(this.dgvInvoice);
             this.Controls.Add(this.dgvInvoice);
             this.Controls.Add(this.gbxCondition);
             this.Controls.Add(this.gbxCondition);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(5);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "F_MST_012001";
             this.Name = "F_MST_012001";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_MST_012001_FormClosed);
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.F_MST_012001_FormClosed);
@@ -610,7 +597,6 @@
         private WinForm.Controls.CkcCheckedComboBox ckcLogo;
         private WinForm.Controls.CkcCheckedComboBox ckcLogo;
         private Basics.BaseControls.C_Label c_Label1;
         private Basics.BaseControls.C_Label c_Label1;
 		private Basics.BaseControls.C_Label lblGoodsType;
 		private Basics.BaseControls.C_Label lblGoodsType;
-		private SearchBox.ScbGoodsType scbGoodsType;
         private System.Windows.Forms.DataGridViewTextBoxColumn LayoutName;
         private System.Windows.Forms.DataGridViewTextBoxColumn LayoutName;
         private System.Windows.Forms.DataGridViewTextBoxColumn goodstypename;
         private System.Windows.Forms.DataGridViewTextBoxColumn goodstypename;
         private System.Windows.Forms.DataGridViewTextBoxColumn logonamecode;
         private System.Windows.Forms.DataGridViewTextBoxColumn logonamecode;
@@ -621,5 +607,6 @@
         private System.Windows.Forms.DataGridViewCheckBoxColumn ValueFlag;
         private System.Windows.Forms.DataGridViewCheckBoxColumn ValueFlag;
         private System.Windows.Forms.DataGridViewTextBoxColumn InvoiceLayoutID;
         private System.Windows.Forms.DataGridViewTextBoxColumn InvoiceLayoutID;
         private System.Windows.Forms.DataGridViewTextBoxColumn goodstypecode;
         private System.Windows.Forms.DataGridViewTextBoxColumn goodstypecode;
+        private SearchBox.ScbGoodsType scbGoodsType;
     }
     }
 }
 }

+ 53 - 74
DK.Client/Client.Controls/Layout/F_MST_012002.designer.cs

@@ -52,9 +52,9 @@
             this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
             this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
             this.ftcLogo = new Dongke.WinForm.Controls.FtcFilterComboBox();
             this.ftcLogo = new Dongke.WinForm.Controls.FtcFilterComboBox();
             this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
-            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
             this.ddlPrintType = new Dongke.WinForm.Controls.FtcFilterComboBox();
             this.ddlPrintType = new Dongke.WinForm.Controls.FtcFilterComboBox();
             this.lblLabel2 = new Dongke.WinForm.Controls.LblLabel();
             this.lblLabel2 = new Dongke.WinForm.Controls.LblLabel();
+            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
             this.gbxPaperSize.SuspendLayout();
             this.gbxPaperSize.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgrdPaperSize)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgrdPaperSize)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numerWidth)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numerWidth)).BeginInit();
@@ -64,11 +64,10 @@
             // txtInvoiceName
             // txtInvoiceName
             // 
             // 
             this.txtInvoiceName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.txtInvoiceName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtInvoiceName.Location = new System.Drawing.Point(92, 108);
-            this.txtInvoiceName.Margin = new System.Windows.Forms.Padding(4);
+            this.txtInvoiceName.Location = new System.Drawing.Point(69, 86);
             this.txtInvoiceName.MaxLength = 50;
             this.txtInvoiceName.MaxLength = 50;
             this.txtInvoiceName.Name = "txtInvoiceName";
             this.txtInvoiceName.Name = "txtInvoiceName";
-            this.txtInvoiceName.Size = new System.Drawing.Size(412, 25);
+            this.txtInvoiceName.Size = new System.Drawing.Size(310, 21);
             this.txtInvoiceName.TabIndex = 5;
             this.txtInvoiceName.TabIndex = 5;
             this.txtInvoiceName.TextChanged += new System.EventHandler(this.txtInvoiceName_TextChanged);
             this.txtInvoiceName.TextChanged += new System.EventHandler(this.txtInvoiceName_TextChanged);
             // 
             // 
@@ -76,10 +75,9 @@
             // 
             // 
             this.lblInvoiceName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblInvoiceName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblInvoiceName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblInvoiceName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.lblInvoiceName.Location = new System.Drawing.Point(15, 114);
-            this.lblInvoiceName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblInvoiceName.Location = new System.Drawing.Point(11, 91);
             this.lblInvoiceName.Name = "lblInvoiceName";
             this.lblInvoiceName.Name = "lblInvoiceName";
-            this.lblInvoiceName.Size = new System.Drawing.Size(67, 15);
+            this.lblInvoiceName.Size = new System.Drawing.Size(53, 12);
             this.lblInvoiceName.TabIndex = 4;
             this.lblInvoiceName.TabIndex = 4;
             this.lblInvoiceName.Text = "标签名称";
             this.lblInvoiceName.Text = "标签名称";
             // 
             // 
@@ -93,11 +91,9 @@
             this.gbxPaperSize.Controls.Add(this.lblWidthUnit);
             this.gbxPaperSize.Controls.Add(this.lblWidthUnit);
             this.gbxPaperSize.Controls.Add(this.lblHeight);
             this.gbxPaperSize.Controls.Add(this.lblHeight);
             this.gbxPaperSize.Controls.Add(this.lblWidth);
             this.gbxPaperSize.Controls.Add(this.lblWidth);
-            this.gbxPaperSize.Location = new System.Drawing.Point(15, 201);
-            this.gbxPaperSize.Margin = new System.Windows.Forms.Padding(4);
+            this.gbxPaperSize.Location = new System.Drawing.Point(11, 161);
             this.gbxPaperSize.Name = "gbxPaperSize";
             this.gbxPaperSize.Name = "gbxPaperSize";
-            this.gbxPaperSize.Padding = new System.Windows.Forms.Padding(4);
-            this.gbxPaperSize.Size = new System.Drawing.Size(493, 309);
+            this.gbxPaperSize.Size = new System.Drawing.Size(370, 247);
             this.gbxPaperSize.TabIndex = 8;
             this.gbxPaperSize.TabIndex = 8;
             this.gbxPaperSize.TabStop = false;
             this.gbxPaperSize.TabStop = false;
             this.gbxPaperSize.Text = "纸张设定";
             this.gbxPaperSize.Text = "纸张设定";
@@ -148,8 +144,7 @@
             this.dgrdPaperSize.IsOpenMergeCellFlag = false;
             this.dgrdPaperSize.IsOpenMergeCellFlag = false;
             this.dgrdPaperSize.IsSubTotalFlag = false;
             this.dgrdPaperSize.IsSubTotalFlag = false;
             this.dgrdPaperSize.IsTopDeep = false;
             this.dgrdPaperSize.IsTopDeep = false;
-            this.dgrdPaperSize.Location = new System.Drawing.Point(3, 59);
-            this.dgrdPaperSize.Margin = new System.Windows.Forms.Padding(4);
+            this.dgrdPaperSize.Location = new System.Drawing.Point(2, 47);
             this.dgrdPaperSize.MergeColumnNames = null;
             this.dgrdPaperSize.MergeColumnNames = null;
             this.dgrdPaperSize.MergeDetailColumnNames = null;
             this.dgrdPaperSize.MergeDetailColumnNames = null;
             this.dgrdPaperSize.MergeDetailOnlyColumn = null;
             this.dgrdPaperSize.MergeDetailOnlyColumn = null;
@@ -164,7 +159,7 @@
             this.dgrdPaperSize.RowsDefaultCellStyle = dataGridViewCellStyle3;
             this.dgrdPaperSize.RowsDefaultCellStyle = dataGridViewCellStyle3;
             this.dgrdPaperSize.RowTemplate.Height = 21;
             this.dgrdPaperSize.RowTemplate.Height = 21;
             this.dgrdPaperSize.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dgrdPaperSize.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgrdPaperSize.Size = new System.Drawing.Size(488, 243);
+            this.dgrdPaperSize.Size = new System.Drawing.Size(366, 194);
             this.dgrdPaperSize.SortOrderColumnName = null;
             this.dgrdPaperSize.SortOrderColumnName = null;
             this.dgrdPaperSize.TabIndex = 6;
             this.dgrdPaperSize.TabIndex = 6;
             this.dgrdPaperSize.Tag = true;
             this.dgrdPaperSize.Tag = true;
@@ -207,8 +202,7 @@
             // 
             // 
             // numerWidth
             // numerWidth
             // 
             // 
-            this.numerWidth.Location = new System.Drawing.Point(87, 25);
-            this.numerWidth.Margin = new System.Windows.Forms.Padding(4);
+            this.numerWidth.Location = new System.Drawing.Point(65, 20);
             this.numerWidth.Maximum = new decimal(new int[] {
             this.numerWidth.Maximum = new decimal(new int[] {
             4200,
             4200,
             0,
             0,
@@ -220,7 +214,7 @@
             0,
             0,
             0});
             0});
             this.numerWidth.Name = "numerWidth";
             this.numerWidth.Name = "numerWidth";
-            this.numerWidth.Size = new System.Drawing.Size(87, 25);
+            this.numerWidth.Size = new System.Drawing.Size(65, 21);
             this.numerWidth.TabIndex = 1;
             this.numerWidth.TabIndex = 1;
             this.numerWidth.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.numerWidth.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.numerWidth.Value = new decimal(new int[] {
             this.numerWidth.Value = new decimal(new int[] {
@@ -231,8 +225,7 @@
             // 
             // 
             // numerHeight
             // numerHeight
             // 
             // 
-            this.numerHeight.Location = new System.Drawing.Point(368, 25);
-            this.numerHeight.Margin = new System.Windows.Forms.Padding(4);
+            this.numerHeight.Location = new System.Drawing.Point(276, 20);
             this.numerHeight.Maximum = new decimal(new int[] {
             this.numerHeight.Maximum = new decimal(new int[] {
             4200,
             4200,
             0,
             0,
@@ -244,7 +237,7 @@
             0,
             0,
             0});
             0});
             this.numerHeight.Name = "numerHeight";
             this.numerHeight.Name = "numerHeight";
-            this.numerHeight.Size = new System.Drawing.Size(87, 25);
+            this.numerHeight.Size = new System.Drawing.Size(65, 21);
             this.numerHeight.TabIndex = 4;
             this.numerHeight.TabIndex = 4;
             this.numerHeight.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.numerHeight.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.numerHeight.Value = new decimal(new int[] {
             this.numerHeight.Value = new decimal(new int[] {
@@ -257,10 +250,9 @@
             // 
             // 
             this.lblHeightUnit.AutoSize = true;
             this.lblHeightUnit.AutoSize = true;
             this.lblHeightUnit.BackColor = System.Drawing.Color.Transparent;
             this.lblHeightUnit.BackColor = System.Drawing.Color.Transparent;
-            this.lblHeightUnit.Location = new System.Drawing.Point(463, 30);
-            this.lblHeightUnit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblHeightUnit.Location = new System.Drawing.Point(347, 24);
             this.lblHeightUnit.Name = "lblHeightUnit";
             this.lblHeightUnit.Name = "lblHeightUnit";
-            this.lblHeightUnit.Size = new System.Drawing.Size(23, 15);
+            this.lblHeightUnit.Size = new System.Drawing.Size(17, 12);
             this.lblHeightUnit.TabIndex = 5;
             this.lblHeightUnit.TabIndex = 5;
             this.lblHeightUnit.Text = "mm";
             this.lblHeightUnit.Text = "mm";
             // 
             // 
@@ -268,30 +260,27 @@
             // 
             // 
             this.lblWidthUnit.AutoSize = true;
             this.lblWidthUnit.AutoSize = true;
             this.lblWidthUnit.BackColor = System.Drawing.Color.Transparent;
             this.lblWidthUnit.BackColor = System.Drawing.Color.Transparent;
-            this.lblWidthUnit.Location = new System.Drawing.Point(181, 28);
-            this.lblWidthUnit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblWidthUnit.Location = new System.Drawing.Point(136, 22);
             this.lblWidthUnit.Name = "lblWidthUnit";
             this.lblWidthUnit.Name = "lblWidthUnit";
-            this.lblWidthUnit.Size = new System.Drawing.Size(23, 15);
+            this.lblWidthUnit.Size = new System.Drawing.Size(17, 12);
             this.lblWidthUnit.TabIndex = 2;
             this.lblWidthUnit.TabIndex = 2;
             this.lblWidthUnit.Text = "mm";
             this.lblWidthUnit.Text = "mm";
             // 
             // 
             // lblHeight
             // lblHeight
             // 
             // 
             this.lblHeight.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblHeight.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblHeight.Location = new System.Drawing.Point(289, 30);
-            this.lblHeight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblHeight.Location = new System.Drawing.Point(217, 24);
             this.lblHeight.Name = "lblHeight";
             this.lblHeight.Name = "lblHeight";
-            this.lblHeight.Size = new System.Drawing.Size(67, 15);
+            this.lblHeight.Size = new System.Drawing.Size(53, 12);
             this.lblHeight.TabIndex = 3;
             this.lblHeight.TabIndex = 3;
             this.lblHeight.Text = "纸张高度";
             this.lblHeight.Text = "纸张高度";
             // 
             // 
             // lblWidth
             // lblWidth
             // 
             // 
             this.lblWidth.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblWidth.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblWidth.Location = new System.Drawing.Point(8, 30);
-            this.lblWidth.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblWidth.Location = new System.Drawing.Point(6, 24);
             this.lblWidth.Name = "lblWidth";
             this.lblWidth.Name = "lblWidth";
-            this.lblWidth.Size = new System.Drawing.Size(67, 15);
+            this.lblWidth.Size = new System.Drawing.Size(53, 12);
             this.lblWidth.TabIndex = 0;
             this.lblWidth.TabIndex = 0;
             this.lblWidth.Text = "纸张宽度";
             this.lblWidth.Text = "纸张宽度";
             // 
             // 
@@ -302,10 +291,9 @@
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.btnCancel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnCancel.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnCancel.ForeColor = System.Drawing.Color.White;
             this.btnCancel.ForeColor = System.Drawing.Color.White;
-            this.btnCancel.Location = new System.Drawing.Point(396, 518);
-            this.btnCancel.Margin = new System.Windows.Forms.Padding(4);
+            this.btnCancel.Location = new System.Drawing.Point(297, 414);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(113, 41);
+            this.btnCancel.Size = new System.Drawing.Size(85, 33);
             this.btnCancel.TabIndex = 10;
             this.btnCancel.TabIndex = 10;
             this.btnCancel.Text = "取消";
             this.btnCancel.Text = "取消";
             this.btnCancel.UseVisualStyleBackColor = false;
             this.btnCancel.UseVisualStyleBackColor = false;
@@ -317,10 +305,9 @@
             this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
             this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
             this.btnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSave.ForeColor = System.Drawing.Color.White;
             this.btnSave.ForeColor = System.Drawing.Color.White;
-            this.btnSave.Location = new System.Drawing.Point(273, 516);
-            this.btnSave.Margin = new System.Windows.Forms.Padding(4);
+            this.btnSave.Location = new System.Drawing.Point(205, 413);
             this.btnSave.Name = "btnSave";
             this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(113, 41);
+            this.btnSave.Size = new System.Drawing.Size(85, 33);
             this.btnSave.TabIndex = 9;
             this.btnSave.TabIndex = 9;
             this.btnSave.Text = "确定";
             this.btnSave.Text = "确定";
             this.btnSave.UseVisualStyleBackColor = false;
             this.btnSave.UseVisualStyleBackColor = false;
@@ -328,31 +315,28 @@
             // 
             // 
             // lblRemark
             // lblRemark
             // 
             // 
-            this.lblRemark.Location = new System.Drawing.Point(45, 142);
-            this.lblRemark.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblRemark.Location = new System.Drawing.Point(34, 114);
             this.lblRemark.Name = "lblRemark";
             this.lblRemark.Name = "lblRemark";
-            this.lblRemark.Size = new System.Drawing.Size(37, 15);
+            this.lblRemark.Size = new System.Drawing.Size(29, 12);
             this.lblRemark.TabIndex = 6;
             this.lblRemark.TabIndex = 6;
             this.lblRemark.Text = "备注";
             this.lblRemark.Text = "备注";
             // 
             // 
             // txtRemark
             // txtRemark
             // 
             // 
-            this.txtRemark.Location = new System.Drawing.Point(92, 142);
-            this.txtRemark.Margin = new System.Windows.Forms.Padding(4);
+            this.txtRemark.Location = new System.Drawing.Point(69, 114);
             this.txtRemark.MaxLength = 500;
             this.txtRemark.MaxLength = 500;
             this.txtRemark.Multiline = true;
             this.txtRemark.Multiline = true;
             this.txtRemark.Name = "txtRemark";
             this.txtRemark.Name = "txtRemark";
             this.txtRemark.ScrollBars = System.Windows.Forms.ScrollBars.Both;
             this.txtRemark.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.txtRemark.Size = new System.Drawing.Size(412, 52);
+            this.txtRemark.Size = new System.Drawing.Size(310, 42);
             this.txtRemark.TabIndex = 7;
             this.txtRemark.TabIndex = 7;
             // 
             // 
             // lblLabel1
             // lblLabel1
             // 
             // 
             this.lblLabel1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblLabel1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblLabel1.Location = new System.Drawing.Point(15, 54);
-            this.lblLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblLabel1.Location = new System.Drawing.Point(11, 43);
             this.lblLabel1.Name = "lblLabel1";
             this.lblLabel1.Name = "lblLabel1";
-            this.lblLabel1.Size = new System.Drawing.Size(67, 15);
+            this.lblLabel1.Size = new System.Drawing.Size(53, 12);
             this.lblLabel1.TabIndex = 1;
             this.lblLabel1.TabIndex = 1;
             this.lblLabel1.Text = "产品商标";
             this.lblLabel1.Text = "产品商标";
             // 
             // 
@@ -360,10 +344,9 @@
             // 
             // 
             this.ftcLogo.FormattingEnabled = true;
             this.ftcLogo.FormattingEnabled = true;
             this.ftcLogo.HasNullData = true;
             this.ftcLogo.HasNullData = true;
-            this.ftcLogo.Location = new System.Drawing.Point(92, 49);
-            this.ftcLogo.Margin = new System.Windows.Forms.Padding(4);
+            this.ftcLogo.Location = new System.Drawing.Point(69, 39);
             this.ftcLogo.Name = "ftcLogo";
             this.ftcLogo.Name = "ftcLogo";
-            this.ftcLogo.Size = new System.Drawing.Size(412, 23);
+            this.ftcLogo.Size = new System.Drawing.Size(310, 20);
             this.ftcLogo.TabIndex = 2;
             this.ftcLogo.TabIndex = 2;
             this.ftcLogo.SelectedValueChanged += new System.EventHandler(this.ftcLogo_SelectedValueChanged);
             this.ftcLogo.SelectedValueChanged += new System.EventHandler(this.ftcLogo_SelectedValueChanged);
             // 
             // 
@@ -374,51 +357,47 @@
             this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGoodsType.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblGoodsType.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblGoodsType.IsMustInput = true;
             this.lblGoodsType.IsMustInput = true;
-            this.lblGoodsType.Location = new System.Drawing.Point(16, 22);
-            this.lblGoodsType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGoodsType.Location = new System.Drawing.Point(12, 18);
             this.lblGoodsType.Name = "lblGoodsType";
             this.lblGoodsType.Name = "lblGoodsType";
-            this.lblGoodsType.Size = new System.Drawing.Size(67, 15);
+            this.lblGoodsType.Size = new System.Drawing.Size(53, 12);
             this.lblGoodsType.TabIndex = 23;
             this.lblGoodsType.TabIndex = 23;
             this.lblGoodsType.Text = "产品类别";
             this.lblGoodsType.Text = "产品类别";
             // 
             // 
-            // scbGoodsType
-            // 
-            this.scbGoodsType.CheckedData = null;
-            this.scbGoodsType.IsOnlyDisplayEnd = false;
-            this.scbGoodsType.Location = new System.Drawing.Point(92, 18);
-            this.scbGoodsType.Margin = new System.Windows.Forms.Padding(4);
-            this.scbGoodsType.Name = "scbGoodsType";
-            this.scbGoodsType.Size = new System.Drawing.Size(413, 26);
-            this.scbGoodsType.TabIndex = 22;
-            this.scbGoodsType.SearchedItemChanged += new System.EventHandler(this.scbGoodsType_SearchedItemChanged);
-            // 
             // ddlPrintType
             // ddlPrintType
             // 
             // 
             this.ddlPrintType.FormattingEnabled = true;
             this.ddlPrintType.FormattingEnabled = true;
             this.ddlPrintType.HasNullData = true;
             this.ddlPrintType.HasNullData = true;
-            this.ddlPrintType.Location = new System.Drawing.Point(92, 78);
-            this.ddlPrintType.Margin = new System.Windows.Forms.Padding(4);
+            this.ddlPrintType.Location = new System.Drawing.Point(69, 62);
             this.ddlPrintType.Name = "ddlPrintType";
             this.ddlPrintType.Name = "ddlPrintType";
-            this.ddlPrintType.Size = new System.Drawing.Size(412, 23);
+            this.ddlPrintType.Size = new System.Drawing.Size(310, 20);
             this.ddlPrintType.TabIndex = 25;
             this.ddlPrintType.TabIndex = 25;
             this.ddlPrintType.SelectedIndexChanged += new System.EventHandler(this.ddlPrintType_SelectedIndexChanged);
             this.ddlPrintType.SelectedIndexChanged += new System.EventHandler(this.ddlPrintType_SelectedIndexChanged);
             // 
             // 
             // lblLabel2
             // lblLabel2
             // 
             // 
             this.lblLabel2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblLabel2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblLabel2.Location = new System.Drawing.Point(15, 83);
-            this.lblLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblLabel2.Location = new System.Drawing.Point(11, 66);
             this.lblLabel2.Name = "lblLabel2";
             this.lblLabel2.Name = "lblLabel2";
-            this.lblLabel2.Size = new System.Drawing.Size(67, 15);
+            this.lblLabel2.Size = new System.Drawing.Size(53, 12);
             this.lblLabel2.TabIndex = 24;
             this.lblLabel2.TabIndex = 24;
             this.lblLabel2.Text = "打印类别";
             this.lblLabel2.Text = "打印类别";
             // 
             // 
+            // scbGoodsType
+            // 
+            this.scbGoodsType.CheckedData = null;
+            this.scbGoodsType.IsOnlyDisplayEnd = false;
+            this.scbGoodsType.Location = new System.Drawing.Point(69, 14);
+            this.scbGoodsType.Name = "scbGoodsType";
+            this.scbGoodsType.Size = new System.Drawing.Size(310, 21);
+            this.scbGoodsType.TabIndex = 22;
+            this.scbGoodsType.SearchedItemChanged += new System.EventHandler(this.scbGoodsType_SearchedItemChanged);
+            // 
             // F_MST_012002
             // F_MST_012002
             // 
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnCancel;
             this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(525, 590);
+            this.ClientSize = new System.Drawing.Size(394, 472);
             this.Controls.Add(this.ddlPrintType);
             this.Controls.Add(this.ddlPrintType);
             this.Controls.Add(this.lblLabel2);
             this.Controls.Add(this.lblLabel2);
             this.Controls.Add(this.lblGoodsType);
             this.Controls.Add(this.lblGoodsType);
@@ -435,7 +414,7 @@
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsSaveFormSize = false;
             this.IsSaveFormSize = false;
-            this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.MaximizeBox = false;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.MinimizeBox = false;
             this.Name = "F_MST_012002";
             this.Name = "F_MST_012002";
@@ -487,8 +466,8 @@
         private WinForm.Controls.LblLabel lblLabel1;
         private WinForm.Controls.LblLabel lblLabel1;
         private WinForm.Controls.FtcFilterComboBox ftcLogo;
         private WinForm.Controls.FtcFilterComboBox ftcLogo;
 		private Basics.BaseControls.C_Label lblGoodsType;
 		private Basics.BaseControls.C_Label lblGoodsType;
-		private SearchBox.ScbGoodsType scbGoodsType;
         private WinForm.Controls.FtcFilterComboBox ddlPrintType;
         private WinForm.Controls.FtcFilterComboBox ddlPrintType;
         private WinForm.Controls.LblLabel lblLabel2;
         private WinForm.Controls.LblLabel lblLabel2;
+        private SearchBox.ScbGoodsType scbGoodsType;
     }
     }
 }
 }

+ 39 - 52
DK.Client/Client.Controls/Layout/F_MST_012004.designer.cs

@@ -37,30 +37,28 @@
             this.txtRemark = new Dongke.WinForm.Controls.TxtTextBox();
             this.txtRemark = new Dongke.WinForm.Controls.TxtTextBox();
             this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
             this.lblLabel1 = new Dongke.WinForm.Controls.LblLabel();
             this.ftcLogo = new Dongke.WinForm.Controls.FtcFilterComboBox();
             this.ftcLogo = new Dongke.WinForm.Controls.FtcFilterComboBox();
-            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
             this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.lblGoodsType = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
             this.ddlPrintType = new Dongke.WinForm.Controls.FtcFilterComboBox();
             this.ddlPrintType = new Dongke.WinForm.Controls.FtcFilterComboBox();
             this.lblLabel2 = new Dongke.WinForm.Controls.LblLabel();
             this.lblLabel2 = new Dongke.WinForm.Controls.LblLabel();
+            this.scbGoodsType = new Dongke.IBOSS.PRD.Client.Controls.SearchBox.ScbGoodsType();
             this.SuspendLayout();
             this.SuspendLayout();
             // 
             // 
             // txtInvoiceName
             // txtInvoiceName
             // 
             // 
             this.txtInvoiceName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.txtInvoiceName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtInvoiceName.Location = new System.Drawing.Point(95, 111);
-            this.txtInvoiceName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtInvoiceName.Location = new System.Drawing.Point(71, 89);
             this.txtInvoiceName.MaxLength = 50;
             this.txtInvoiceName.MaxLength = 50;
             this.txtInvoiceName.Name = "txtInvoiceName";
             this.txtInvoiceName.Name = "txtInvoiceName";
-            this.txtInvoiceName.Size = new System.Drawing.Size(436, 25);
+            this.txtInvoiceName.Size = new System.Drawing.Size(328, 21);
             this.txtInvoiceName.TabIndex = 4;
             this.txtInvoiceName.TabIndex = 4;
             this.txtInvoiceName.TextChanged += new System.EventHandler(this.txtInvoiceName_TextChanged);
             this.txtInvoiceName.TextChanged += new System.EventHandler(this.txtInvoiceName_TextChanged);
             // 
             // 
             // lblInvoiceName
             // lblInvoiceName
             // 
             // 
             this.lblInvoiceName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblInvoiceName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblInvoiceName.Location = new System.Drawing.Point(16, 54);
-            this.lblInvoiceName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblInvoiceName.Location = new System.Drawing.Point(12, 43);
             this.lblInvoiceName.Name = "lblInvoiceName";
             this.lblInvoiceName.Name = "lblInvoiceName";
-            this.lblInvoiceName.Size = new System.Drawing.Size(67, 15);
+            this.lblInvoiceName.Size = new System.Drawing.Size(53, 12);
             this.lblInvoiceName.TabIndex = 1;
             this.lblInvoiceName.TabIndex = 1;
             this.lblInvoiceName.Text = "产品商标";
             this.lblInvoiceName.Text = "产品商标";
             // 
             // 
@@ -69,10 +67,9 @@
             this.chkValueFlag.Checked = true;
             this.chkValueFlag.Checked = true;
             this.chkValueFlag.CheckState = System.Windows.Forms.CheckState.Checked;
             this.chkValueFlag.CheckState = System.Windows.Forms.CheckState.Checked;
             this.chkValueFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.chkValueFlag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.chkValueFlag.Location = new System.Drawing.Point(95, 231);
-            this.chkValueFlag.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.chkValueFlag.Location = new System.Drawing.Point(71, 185);
             this.chkValueFlag.Name = "chkValueFlag";
             this.chkValueFlag.Name = "chkValueFlag";
-            this.chkValueFlag.Size = new System.Drawing.Size(59, 19);
+            this.chkValueFlag.Size = new System.Drawing.Size(48, 16);
             this.chkValueFlag.TabIndex = 7;
             this.chkValueFlag.TabIndex = 7;
             this.chkValueFlag.Text = "有效";
             this.chkValueFlag.Text = "有效";
             this.chkValueFlag.UseVisualStyleBackColor = true;
             this.chkValueFlag.UseVisualStyleBackColor = true;
@@ -81,10 +78,9 @@
             // btnOK
             // btnOK
             // 
             // 
             this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnOK.Location = new System.Drawing.Point(297, 252);
-            this.btnOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnOK.Location = new System.Drawing.Point(223, 202);
             this.btnOK.Name = "btnOK";
             this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(113, 38);
+            this.btnOK.Size = new System.Drawing.Size(85, 30);
             this.btnOK.TabIndex = 8;
             this.btnOK.TabIndex = 8;
             this.btnOK.Text = "确定";
             this.btnOK.Text = "确定";
             this.btnOK.UseVisualStyleBackColor = true;
             this.btnOK.UseVisualStyleBackColor = true;
@@ -94,10 +90,9 @@
             // 
             // 
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnCancel.Location = new System.Drawing.Point(419, 252);
-            this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnCancel.Location = new System.Drawing.Point(314, 202);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(113, 38);
+            this.btnCancel.Size = new System.Drawing.Size(85, 30);
             this.btnCancel.TabIndex = 9;
             this.btnCancel.TabIndex = 9;
             this.btnCancel.Text = "取消";
             this.btnCancel.Text = "取消";
             this.btnCancel.UseVisualStyleBackColor = true;
             this.btnCancel.UseVisualStyleBackColor = true;
@@ -105,32 +100,29 @@
             // 
             // 
             // lblRemark
             // lblRemark
             // 
             // 
-            this.lblRemark.Location = new System.Drawing.Point(48, 145);
-            this.lblRemark.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblRemark.Location = new System.Drawing.Point(36, 116);
             this.lblRemark.Name = "lblRemark";
             this.lblRemark.Name = "lblRemark";
-            this.lblRemark.Size = new System.Drawing.Size(37, 15);
+            this.lblRemark.Size = new System.Drawing.Size(29, 12);
             this.lblRemark.TabIndex = 5;
             this.lblRemark.TabIndex = 5;
             this.lblRemark.Text = "备注";
             this.lblRemark.Text = "备注";
             // 
             // 
             // txtRemark
             // txtRemark
             // 
             // 
-            this.txtRemark.Location = new System.Drawing.Point(95, 145);
-            this.txtRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtRemark.Location = new System.Drawing.Point(71, 116);
             this.txtRemark.MaxLength = 500;
             this.txtRemark.MaxLength = 500;
             this.txtRemark.Multiline = true;
             this.txtRemark.Multiline = true;
             this.txtRemark.Name = "txtRemark";
             this.txtRemark.Name = "txtRemark";
             this.txtRemark.ScrollBars = System.Windows.Forms.ScrollBars.Both;
             this.txtRemark.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.txtRemark.Size = new System.Drawing.Size(436, 73);
+            this.txtRemark.Size = new System.Drawing.Size(328, 59);
             this.txtRemark.TabIndex = 6;
             this.txtRemark.TabIndex = 6;
             // 
             // 
             // lblLabel1
             // lblLabel1
             // 
             // 
             this.lblLabel1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblLabel1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
             this.lblLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.lblLabel1.Location = new System.Drawing.Point(16, 116);
-            this.lblLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblLabel1.Location = new System.Drawing.Point(12, 93);
             this.lblLabel1.Name = "lblLabel1";
             this.lblLabel1.Name = "lblLabel1";
-            this.lblLabel1.Size = new System.Drawing.Size(67, 15);
+            this.lblLabel1.Size = new System.Drawing.Size(53, 12);
             this.lblLabel1.TabIndex = 3;
             this.lblLabel1.TabIndex = 3;
             this.lblLabel1.Text = "标签名称";
             this.lblLabel1.Text = "标签名称";
             // 
             // 
@@ -138,34 +130,21 @@
             // 
             // 
             this.ftcLogo.FormattingEnabled = true;
             this.ftcLogo.FormattingEnabled = true;
             this.ftcLogo.HasNullData = true;
             this.ftcLogo.HasNullData = true;
-            this.ftcLogo.Location = new System.Drawing.Point(95, 49);
-            this.ftcLogo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ftcLogo.Location = new System.Drawing.Point(71, 39);
             this.ftcLogo.Name = "ftcLogo";
             this.ftcLogo.Name = "ftcLogo";
-            this.ftcLogo.Size = new System.Drawing.Size(436, 23);
+            this.ftcLogo.Size = new System.Drawing.Size(328, 20);
             this.ftcLogo.TabIndex = 2;
             this.ftcLogo.TabIndex = 2;
             this.ftcLogo.SelectedIndexChanged += new System.EventHandler(this.ftcLogo_SelectedIndexChanged);
             this.ftcLogo.SelectedIndexChanged += new System.EventHandler(this.ftcLogo_SelectedIndexChanged);
             // 
             // 
-            // scbGoodsType
-            // 
-            this.scbGoodsType.CheckedData = null;
-            this.scbGoodsType.IsOnlyDisplayEnd = false;
-            this.scbGoodsType.Location = new System.Drawing.Point(95, 15);
-            this.scbGoodsType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.scbGoodsType.Name = "scbGoodsType";
-            this.scbGoodsType.Size = new System.Drawing.Size(437, 26);
-            this.scbGoodsType.TabIndex = 21;
-            this.scbGoodsType.SearchedItemChanged += new System.EventHandler(this.scbGoodsType_SearchedItemChanged);
-            // 
             // lblGoodsType
             // lblGoodsType
             // 
             // 
             this.lblGoodsType.AutoSize = true;
             this.lblGoodsType.AutoSize = true;
             this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
             this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
             this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGoodsType.ForeColor = System.Drawing.SystemColors.ControlText;
             this.lblGoodsType.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblGoodsType.Location = new System.Drawing.Point(16, 21);
-            this.lblGoodsType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblGoodsType.Location = new System.Drawing.Point(12, 17);
             this.lblGoodsType.Name = "lblGoodsType";
             this.lblGoodsType.Name = "lblGoodsType";
-            this.lblGoodsType.Size = new System.Drawing.Size(67, 15);
+            this.lblGoodsType.Size = new System.Drawing.Size(53, 12);
             this.lblGoodsType.TabIndex = 22;
             this.lblGoodsType.TabIndex = 22;
             this.lblGoodsType.Text = "产品类别";
             this.lblGoodsType.Text = "产品类别";
             // 
             // 
@@ -173,28 +152,36 @@
             // 
             // 
             this.ddlPrintType.FormattingEnabled = true;
             this.ddlPrintType.FormattingEnabled = true;
             this.ddlPrintType.HasNullData = true;
             this.ddlPrintType.HasNullData = true;
-            this.ddlPrintType.Location = new System.Drawing.Point(95, 80);
-            this.ddlPrintType.Margin = new System.Windows.Forms.Padding(4);
+            this.ddlPrintType.Location = new System.Drawing.Point(71, 64);
             this.ddlPrintType.Name = "ddlPrintType";
             this.ddlPrintType.Name = "ddlPrintType";
-            this.ddlPrintType.Size = new System.Drawing.Size(436, 23);
+            this.ddlPrintType.Size = new System.Drawing.Size(328, 20);
             this.ddlPrintType.TabIndex = 24;
             this.ddlPrintType.TabIndex = 24;
             // 
             // 
             // lblLabel2
             // lblLabel2
             // 
             // 
             this.lblLabel2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblLabel2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblLabel2.Location = new System.Drawing.Point(16, 85);
-            this.lblLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblLabel2.Location = new System.Drawing.Point(12, 68);
             this.lblLabel2.Name = "lblLabel2";
             this.lblLabel2.Name = "lblLabel2";
-            this.lblLabel2.Size = new System.Drawing.Size(67, 15);
+            this.lblLabel2.Size = new System.Drawing.Size(53, 12);
             this.lblLabel2.TabIndex = 23;
             this.lblLabel2.TabIndex = 23;
             this.lblLabel2.Text = "打印类型";
             this.lblLabel2.Text = "打印类型";
             // 
             // 
+            // scbGoodsType
+            // 
+            this.scbGoodsType.CheckedData = null;
+            this.scbGoodsType.IsOnlyDisplayEnd = false;
+            this.scbGoodsType.Location = new System.Drawing.Point(71, 12);
+            this.scbGoodsType.Name = "scbGoodsType";
+            this.scbGoodsType.Size = new System.Drawing.Size(328, 21);
+            this.scbGoodsType.TabIndex = 21;
+            this.scbGoodsType.SearchedItemChanged += new System.EventHandler(this.scbGoodsType_SearchedItemChanged);
+            // 
             // F_MST_012004
             // F_MST_012004
             // 
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnCancel;
             this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(548, 321);
+            this.ClientSize = new System.Drawing.Size(411, 257);
             this.Controls.Add(this.ddlPrintType);
             this.Controls.Add(this.ddlPrintType);
             this.Controls.Add(this.lblLabel2);
             this.Controls.Add(this.lblLabel2);
             this.Controls.Add(this.lblGoodsType);
             this.Controls.Add(this.lblGoodsType);
@@ -210,7 +197,7 @@
             this.Controls.Add(this.btnOK);
             this.Controls.Add(this.btnOK);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.IsSaveFormSize = false;
             this.IsSaveFormSize = false;
-            this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
+            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.MaximizeBox = false;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.MinimizeBox = false;
             this.Name = "F_MST_012004";
             this.Name = "F_MST_012004";
@@ -246,9 +233,9 @@
         private WinForm.Controls.TxtTextBox txtRemark;
         private WinForm.Controls.TxtTextBox txtRemark;
         private WinForm.Controls.LblLabel lblLabel1;
         private WinForm.Controls.LblLabel lblLabel1;
         private WinForm.Controls.FtcFilterComboBox ftcLogo;
         private WinForm.Controls.FtcFilterComboBox ftcLogo;
-		private SearchBox.ScbGoodsType scbGoodsType;
 		private Basics.BaseControls.C_Label lblGoodsType;
 		private Basics.BaseControls.C_Label lblGoodsType;
         private WinForm.Controls.FtcFilterComboBox ddlPrintType;
         private WinForm.Controls.FtcFilterComboBox ddlPrintType;
         private WinForm.Controls.LblLabel lblLabel2;
         private WinForm.Controls.LblLabel lblLabel2;
+        private SearchBox.ScbGoodsType scbGoodsType;
     }
     }
 }
 }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 363 - 197
DK.Client/PCModule/F_PC_0104_1.Designer.cs


+ 3 - 3
DK.Client/PCModule/F_PC_0104_1.resx

@@ -124,7 +124,7 @@
   <data name="tsbtnDisable.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
   <data name="tsbtnDisable.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
@@ -139,7 +139,7 @@
   <data name="tsbtnStart.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
   <data name="tsbtnStart.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
@@ -154,7 +154,7 @@
   <data name="tsbtnManager.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
   <data name="tsbtnManager.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
         bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio