From a5fa0991eeb084e3ddaac69fce80dfd32d06db41 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 19 四月 2024 13:31:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/生产基础资料/Gy_Source.designer.cs | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.designer.cs"
index 616ffca..534173a 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.designer.cs"
@@ -32,6 +32,7 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_Source));
System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("椤圭洰");
this.ToolBar = new System.Windows.Forms.ToolStrip();
+ this.dy = new System.Windows.Forms.ToolStripButton();
this.yl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.xz = new System.Windows.Forms.ToolStripButton();
@@ -107,12 +108,14 @@
this.panel1 = new System.Windows.Forms.Panel();
this.cmdLoadTree = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label();
- this.dy = new System.Windows.Forms.ToolStripButton();
+ this.dc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.ToolBar.SuspendLayout();
this.stTab.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
this.tabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
@@ -126,6 +129,8 @@
this.ToolBar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ToolBar.ImageScalingSize = new System.Drawing.Size(22, 22);
this.ToolBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.dc,
+ this.toolStripSeparator6,
this.dy,
this.yl,
this.toolStripSeparator4,
@@ -153,6 +158,20 @@
this.ToolBar.Stretch = true;
this.ToolBar.TabIndex = 13;
this.ToolBar.Text = "toolStrip1";
+ //
+ // dy
+ //
+ this.dy.AutoSize = false;
+ this.dy.Image = ((System.Drawing.Image)(resources.GetObject("dy.Image")));
+ this.dy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dy.ImageTransparentColor = System.Drawing.Color.White;
+ this.dy.Name = "dy";
+ this.dy.Size = new System.Drawing.Size(35, 47);
+ this.dy.Text = "鎵撳嵃";
+ this.dy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dy.Click += new System.EventHandler(this.dy_Click);
//
// yl
//
@@ -978,19 +997,24 @@
this.label3.TabIndex = 0;
this.label3.Text = "鐢熶骇璧勬簮璧勬枡-姝ｅ湪娴忚";
//
- // dy
+ // dc
//
- this.dy.AutoSize = false;
- this.dy.Image = ((System.Drawing.Image)(resources.GetObject("dy.Image")));
- this.dy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.dy.ImageTransparentColor = System.Drawing.Color.White;
- this.dy.Name = "dy";
- this.dy.Size = new System.Drawing.Size(35, 47);
- this.dy.Text = "鎵撳嵃";
- this.dy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.dy.Click += new System.EventHandler(this.dy_Click);
+ this.dc.AutoSize = false;
+ this.dc.Image = ((System.Drawing.Image)(resources.GetObject("dc.Image")));
+ this.dc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dc.ImageTransparentColor = System.Drawing.Color.White;
+ this.dc.Name = "dc";
+ this.dc.Size = new System.Drawing.Size(36, 47);
+ this.dc.Text = "寮曞嚭";
+ this.dc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dc.Click += new System.EventHandler(this.dc_Click);
+ //
+ // toolStripSeparator6
+ //
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
//
// Gy_Source
//
@@ -1003,8 +1027,8 @@
this.Name = "Gy_Source";
this.Text = "鐢熶骇璧勬簮璁剧疆";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
- this.Load += new System.EventHandler(this.Gy_Source_Load);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Gy_Source_FormClosing);
+ this.Load += new System.EventHandler(this.Gy_Source_Load);
this.ToolBar.ResumeLayout(false);
this.ToolBar.PerformLayout();
this.stTab.ResumeLayout(false);
@@ -1014,6 +1038,7 @@
this.tabPage2.PerformLayout();
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
@@ -1100,5 +1125,7 @@
private System.Windows.Forms.Label label18;
private System.Windows.Forms.TextBox txtHDeptID;
private System.Windows.Forms.ToolStripButton dy;
+ private System.Windows.Forms.ToolStripButton dc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
}
}
\ No newline at end of file
--
Gitblit v1.9.1