From 328bde0d2678361078f9f1a714049f7b7ad69198 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 26 十月 2022 16:47:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_BarCodeBill.designer.cs | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index c5abf71..332204e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -37,9 +37,9 @@
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.AddRow = new System.Windows.Forms.ToolStripButton();
this.spRow = new System.Windows.Forms.ToolStripButton();
+ this.bc = new System.Windows.Forms.ToolStripButton();
this.DelRow = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
- this.bc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.wxm = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
@@ -139,9 +139,9 @@
this.toolStripSeparator2,
this.AddRow,
this.spRow,
+ this.bc,
this.DelRow,
this.toolStripSeparator4,
- this.bc,
this.toolStripSeparator8,
this.wxm,
this.toolStripSeparator9,
@@ -245,6 +245,20 @@
this.spRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.spRow.Click += new System.EventHandler(this.spRow_Click);
//
+ // bc
+ //
+ this.bc.AutoSize = false;
+ this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
+ this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.bc.Name = "bc";
+ this.bc.Size = new System.Drawing.Size(35, 47);
+ this.bc.Text = "鐢熸垚";
+ this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bc.Click += new System.EventHandler(this.bc_Click);
+ //
// DelRow
//
this.DelRow.AutoSize = false;
@@ -263,20 +277,7 @@
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
- //
- // bc
- //
- this.bc.AutoSize = false;
- this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
- this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.bc.Name = "bc";
- this.bc.Size = new System.Drawing.Size(35, 47);
- this.bc.Text = "鐢熸垚";
- this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.bc.Click += new System.EventHandler(this.bc_Click);
+ this.toolStripSeparator4.Visible = false;
//
// toolStripSeparator8
//
@@ -1058,7 +1059,7 @@
this.tabPage3.Location = new System.Drawing.Point(4, 25);
this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage3.Name = "tabPage3";
- this.tabPage3.Size = new System.Drawing.Size(1242, 348);
+ this.tabPage3.Size = new System.Drawing.Size(1241, 347);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "妗ｆ鍒楄〃";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -1078,7 +1079,7 @@
this.grdList.ReadOnly = true;
this.grdList.RowHeadersWidth = 30;
this.grdList.RowTemplate.Height = 23;
- this.grdList.Size = new System.Drawing.Size(1242, 348);
+ this.grdList.Size = new System.Drawing.Size(1241, 347);
this.grdList.TabIndex = 46;
//
// Gy_BarCodeBill
--
Gitblit v1.9.1