From 11d20b4fb7a3e97c88477f78f1f5393238e2f3a3 Mon Sep 17 00:00:00 2001
From: ouyangqing <ouyangqing@DESKTOP-B85SG1D>
Date: 星期三, 20 一月 2021 13:53:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes
---
SCM/单据资料/Gy_BarCodeMain.Designer.cs | 79 ++++++++++++---------------------------
1 files changed, 25 insertions(+), 54 deletions(-)
diff --git "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.Designer.cs" "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.Designer.cs"
index 95711ac..20afaf3 100644
--- "a/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.Designer.cs"
+++ "b/SCM/\345\215\225\346\215\256\350\265\204\346\226\231/Gy_BarCodeMain.Designer.cs"
@@ -48,14 +48,12 @@
this.lbldj = new System.Windows.Forms.Label();
this.lblCaption = new System.Windows.Forms.Label();
this.Tool = new System.Windows.Forms.ToolStrip();
- this.yl = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.cx = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
- this.comboBox1 = new System.Windows.Forms.ComboBox();
- this.label8 = new System.Windows.Forms.Label();
+ this.yl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.groupBox1.SuspendLayout();
this.pPic.SuspendLayout();
@@ -71,7 +69,7 @@
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.Location = new System.Drawing.Point(0, 232);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
@@ -82,8 +80,6 @@
// groupBox1
//
this.groupBox1.BackColor = System.Drawing.Color.Lavender;
- this.groupBox1.Controls.Add(this.comboBox1);
- this.groupBox1.Controls.Add(this.label8);
this.groupBox1.Controls.Add(this.dateTimePicker2);
this.groupBox1.Controls.Add(this.dateTimePicker1);
this.groupBox1.Controls.Add(this.label9);
@@ -96,9 +92,9 @@
this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox1.Location = new System.Drawing.Point(0, 103);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Size = new System.Drawing.Size(1277, 129);
this.groupBox1.TabIndex = 56;
this.groupBox1.TabStop = false;
@@ -146,7 +142,7 @@
// textBox2
//
this.textBox2.Location = new System.Drawing.Point(628, 75);
- this.textBox2.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(172, 25);
this.textBox2.TabIndex = 16;
@@ -164,7 +160,7 @@
// textBox1
//
this.textBox1.Location = new System.Drawing.Point(365, 75);
- this.textBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(172, 25);
this.textBox1.TabIndex = 14;
@@ -182,7 +178,7 @@
// txtHBillNo
//
this.txtHBillNo.Location = new System.Drawing.Point(96, 76);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHBillNo.Name = "txtHBillNo";
this.txtHBillNo.Size = new System.Drawing.Size(172, 25);
this.txtHBillNo.TabIndex = 12;
@@ -206,7 +202,7 @@
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
this.pPic.Location = new System.Drawing.Point(0, 62);
- this.pPic.Margin = new System.Windows.Forms.Padding(4);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pPic.Name = "pPic";
this.pPic.Size = new System.Drawing.Size(1277, 41);
this.pPic.TabIndex = 55;
@@ -217,7 +213,7 @@
this.panel1.Controls.Add(this.lbldj);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
this.panel1.Location = new System.Drawing.Point(1096, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(181, 41);
this.panel1.TabIndex = 7;
@@ -276,25 +272,6 @@
this.Tool.TabIndex = 54;
this.Tool.Text = "toolStrip1";
//
- // yl
- //
- this.yl.AutoSize = false;
- this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
- this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.yl.Name = "yl";
- this.yl.Size = new System.Drawing.Size(35, 42);
- this.yl.Text = "寮曞嚭";
- this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.yl.Click += new System.EventHandler(this.yl_Click);
- //
- // toolStripSeparator1
- //
- this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
- //
// cx
//
this.cx.AutoSize = false;
@@ -334,28 +311,24 @@
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
- // comboBox1
+ // yl
//
- this.comboBox1.FormattingEnabled = true;
- this.comboBox1.Items.AddRange(new object[] {
- "鍏ㄩ儴",
- "宸叉楠�",
- "鏈楠�"});
- this.comboBox1.Location = new System.Drawing.Point(907, 75);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(172, 23);
- this.comboBox1.TabIndex = 35;
+ this.yl.AutoSize = false;
+ this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
+ this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.yl.Name = "yl";
+ this.yl.Size = new System.Drawing.Size(35, 42);
+ this.yl.Text = "寮曞嚭";
+ this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.yl.Click += new System.EventHandler(this.yl_Click);
//
- // label8
+ // toolStripSeparator1
//
- this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(818, 80);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(82, 15);
- this.label8.TabIndex = 34;
- this.label8.Text = "妫�楠岀姸鍐碉細";
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
//
// Gy_BarCodeMain
//
@@ -408,7 +381,5 @@
private System.Windows.Forms.Label label11;
private System.Windows.Forms.ToolStripButton yl;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
- private System.Windows.Forms.ComboBox comboBox1;
- private System.Windows.Forms.Label label8;
}
}
\ No newline at end of file
--
Gitblit v1.9.1