From 9305340d0d22505ead926186eb5bc441c9cbf76b Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 27 五月 2022 21:37:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_BarCodeBillList.designer.cs | 170 +++++++++++++++++---------------------------------------
1 files changed, 52 insertions(+), 118 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs"
index 283100a..95a0fd1 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs"
@@ -37,23 +37,17 @@
this.lblCaption = new System.Windows.Forms.Label();
this.Tool = new System.Windows.Forms.ToolStrip();
this.dy = new System.Windows.Forms.ToolStripButton();
- this.dy2 = new System.Windows.Forms.ToolStripButton();
this.yl = new System.Windows.Forms.ToolStripButton();
- this.yc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.cx = new System.Windows.Forms.ToolStripButton();
this.sx = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
- this.xz = new System.Windows.Forms.ToolStripButton();
- this.dj = new System.Windows.Forms.ToolStripButton();
this.sc = new System.Windows.Forms.ToolStripButton();
+ this.ps = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.zf = new System.Windows.Forms.ToolStripButton();
this.fzf = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
- this.sh = new System.Windows.Forms.ToolStripButton();
- this.qsh = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
@@ -65,6 +59,9 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdPrint = new System.Windows.Forms.DataGridView();
+ this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
+ this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.pPic.SuspendLayout();
this.panel1.SuspendLayout();
this.Tool.SuspendLayout();
@@ -132,24 +129,19 @@
this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.toolStripDropDownButton1,
this.dy,
- this.dy2,
this.yl,
- this.yc,
this.toolStripSeparator2,
this.cx,
this.sx,
this.toolStripSeparator1,
- this.xz,
- this.dj,
this.sc,
+ this.ps,
this.toolStripSeparator5,
this.zf,
this.fzf,
this.toolStripSeparator6,
- this.sh,
- this.qsh,
- this.toolStripSeparator4,
this.tc,
this.toolStripSeparator3,
this.toolStripSeparator9,
@@ -179,21 +171,6 @@
this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.dy.Click += new System.EventHandler(this.dy_Click);
//
- // dy2
- //
- this.dy2.AutoSize = false;
- this.dy2.Image = ((System.Drawing.Image)(resources.GetObject("dy2.Image")));
- this.dy2.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dy2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.dy2.ImageTransparentColor = System.Drawing.Color.White;
- this.dy2.Name = "dy2";
- this.dy2.Size = new System.Drawing.Size(36, 47);
- this.dy2.Text = "杩炴墦";
- this.dy2.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dy2.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.dy2.Visible = false;
- this.dy2.Click += new System.EventHandler(this.dy2_Click);
- //
// yl
//
this.yl.AutoSize = false;
@@ -207,20 +184,6 @@
this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.yl.Click += new System.EventHandler(this.yl_Click);
- //
- // yc
- //
- this.yc.AutoSize = false;
- this.yc.Image = ((System.Drawing.Image)(resources.GetObject("yc.Image")));
- this.yc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.yc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.yc.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.yc.Name = "yc";
- this.yc.Size = new System.Drawing.Size(36, 47);
- this.yc.Text = "寮曞嚭";
- this.yc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.yc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.yc.Click += new System.EventHandler(this.yc_Click);
//
// toolStripSeparator2
//
@@ -259,37 +222,6 @@
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
- this.toolStripSeparator1.Visible = false;
- //
- // xz
- //
- this.xz.AutoSize = false;
- this.xz.Image = ((System.Drawing.Image)(resources.GetObject("xz.Image")));
- this.xz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.xz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.xz.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.xz.Name = "xz";
- this.xz.Size = new System.Drawing.Size(36, 47);
- this.xz.Text = "鏂板";
- this.xz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.xz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.xz.Visible = false;
- this.xz.Click += new System.EventHandler(this.xz_Click);
- //
- // dj
- //
- this.dj.AutoSize = false;
- this.dj.Image = ((System.Drawing.Image)(resources.GetObject("dj.Image")));
- this.dj.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dj.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.dj.ImageTransparentColor = System.Drawing.Color.White;
- this.dj.Name = "dj";
- this.dj.Size = new System.Drawing.Size(36, 47);
- this.dj.Text = "鍗曟嵁";
- this.dj.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dj.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.dj.Visible = false;
- this.dj.Click += new System.EventHandler(this.dj_Click);
//
// sc
//
@@ -304,6 +236,20 @@
this.sc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.sc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.sc.Click += new System.EventHandler(this.sc_Click);
+ //
+ // ps
+ //
+ this.ps.AutoSize = false;
+ this.ps.Image = ((System.Drawing.Image)(resources.GetObject("ps.Image")));
+ this.ps.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.ps.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.ps.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.ps.Name = "ps";
+ this.ps.Size = new System.Drawing.Size(36, 47);
+ this.ps.Text = "鎵瑰垹";
+ this.ps.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.ps.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.ps.Click += new System.EventHandler(this.ps_Click);
//
// toolStripSeparator5
//
@@ -342,42 +288,6 @@
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
- //
- // sh
- //
- this.sh.AutoSize = false;
- this.sh.Image = ((System.Drawing.Image)(resources.GetObject("sh.Image")));
- this.sh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sh.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.sh.Name = "sh";
- this.sh.Size = new System.Drawing.Size(36, 47);
- this.sh.Text = "瀹℃牳";
- this.sh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sh.Visible = false;
- this.sh.Click += new System.EventHandler(this.sh_Click);
- //
- // qsh
- //
- this.qsh.AutoSize = false;
- this.qsh.Image = ((System.Drawing.Image)(resources.GetObject("qsh.Image")));
- this.qsh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.qsh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.qsh.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.qsh.Name = "qsh";
- this.qsh.Size = new System.Drawing.Size(36, 47);
- this.qsh.Text = "鍙嶅";
- this.qsh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.qsh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.qsh.Visible = false;
- this.qsh.Click += new System.EventHandler(this.qsh_Click);
- //
- // toolStripSeparator4
- //
- this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
- this.toolStripSeparator4.Visible = false;
//
// tc
//
@@ -466,7 +376,6 @@
this.grdMain.RowTemplate.Height = 23;
this.grdMain.Size = new System.Drawing.Size(906, 428);
this.grdMain.TabIndex = 19;
- this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
//
// grdPrint
@@ -478,6 +387,34 @@
this.grdPrint.Size = new System.Drawing.Size(25, 24);
this.grdPrint.TabIndex = 8;
this.grdPrint.Visible = false;
+ //
+ // toolStripDropDownButton1
+ //
+ this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.eXCELToolStripMenuItem,
+ this.cSVToolStripMenuItem});
+ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
+ this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 47);
+ this.toolStripDropDownButton1.Text = "寮曞嚭";
+ this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ //
+ // eXCELToolStripMenuItem
+ //
+ this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.eXCELToolStripMenuItem.Text = "EXCEL";
+ this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
+ //
+ // cSVToolStripMenuItem
+ //
+ this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+ this.cSVToolStripMenuItem.Text = "CSV";
+ this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
// Gy_BarCodeBillList
//
@@ -517,10 +454,7 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
public System.Windows.Forms.Timer timer1;
private System.Windows.Forms.ToolStripButton sx;
- private System.Windows.Forms.ToolStripButton dj;
- private System.Windows.Forms.ToolStripButton xz;
private System.Windows.Forms.ToolStripButton sc;
- private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.Timer timer2;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
private System.Windows.Forms.ToolStripButton mrlk;
@@ -528,18 +462,18 @@
private System.Windows.Forms.ToolStripButton bclk;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
- private System.Windows.Forms.ToolStripButton sh;
- private System.Windows.Forms.ToolStripButton qsh;
private System.Windows.Forms.DataGridView grdMain;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbljl;
private System.Windows.Forms.Label lbldj;
private System.Windows.Forms.DataGridView grdPrint;
private System.Windows.Forms.ToolStripButton dy;
- private System.Windows.Forms.ToolStripButton dy2;
- private System.Windows.Forms.ToolStripButton yc;
private System.Windows.Forms.ToolStripButton fzf;
private System.Windows.Forms.ToolStripButton zf;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+ private System.Windows.Forms.ToolStripButton ps;
+ private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
+ private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
+ private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
}
}
\ No newline at end of file
--
Gitblit v1.9.1