From c5cfa2df88c6d2e5b31e87e1d5a8fe49d585f0bb Mon Sep 17 00:00:00 2001
From: jinghz@oceic.com <jinghz@oceic.com>
Date: 星期四, 24 八月 2023 10:44:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/其他基础资料/Gy_ProcPriceList.designer.cs | 72 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 30 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.designer.cs"
index b6c981f..e2506ee 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ProcPriceList.designer.cs"
@@ -69,6 +69,7 @@
this.tabPage1 = new System.Windows.Forms.TabPage();
this.grdMain = new System.Windows.Forms.DataGridView();
this.ToolBar.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
@@ -115,7 +116,7 @@
this.ToolBar.Location = new System.Drawing.Point(0, 0);
this.ToolBar.Name = "ToolBar";
this.ToolBar.Padding = new System.Windows.Forms.Padding(0);
- this.ToolBar.Size = new System.Drawing.Size(937, 50);
+ this.ToolBar.Size = new System.Drawing.Size(1249, 62);
this.ToolBar.Stretch = true;
this.ToolBar.TabIndex = 13;
this.ToolBar.Text = "toolStrip1";
@@ -150,7 +151,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
//
// wl
//
@@ -186,7 +187,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
//
// xz
//
@@ -234,7 +235,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
//
// cx
//
@@ -267,13 +268,13 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
//
// mrlk
//
@@ -283,7 +284,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(60, 47);
+ this.mrlk.Size = new System.Drawing.Size(73, 59);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -293,7 +294,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
//
// bclk
//
@@ -303,7 +304,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(60, 47);
+ this.bclk.Size = new System.Drawing.Size(73, 59);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -313,7 +314,7 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
// sh
//
@@ -346,7 +347,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
//
// fz
//
@@ -366,7 +367,7 @@
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
- this.toolStripSeparator11.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 62);
this.toolStripSeparator11.Visible = false;
//
// pg
@@ -386,7 +387,7 @@
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
//
// tc
//
@@ -405,7 +406,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
//
// imageList1
//
@@ -422,7 +423,8 @@
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer1.Location = new System.Drawing.Point(0, 50);
+ this.splitContainer1.Location = new System.Drawing.Point(0, 62);
+ this.splitContainer1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
@@ -433,8 +435,9 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.stTab);
- this.splitContainer1.Size = new System.Drawing.Size(937, 495);
- this.splitContainer1.SplitterDistance = 147;
+ this.splitContainer1.Size = new System.Drawing.Size(1249, 619);
+ this.splitContainer1.SplitterDistance = 195;
+ this.splitContainer1.SplitterWidth = 5;
this.splitContainer1.TabIndex = 16;
//
// tv
@@ -447,7 +450,8 @@
this.tv.Indent = 18;
this.tv.ItemHeight = 18;
this.tv.LineColor = System.Drawing.Color.Navy;
- this.tv.Location = new System.Drawing.Point(0, 20);
+ this.tv.Location = new System.Drawing.Point(0, 24);
+ this.tv.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tv.Name = "tv";
treeNode1.ForeColor = System.Drawing.Color.Black;
treeNode1.Name = "tjbb";
@@ -457,7 +461,7 @@
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode1});
this.tv.SelectedImageIndex = 1;
- this.tv.Size = new System.Drawing.Size(147, 475);
+ this.tv.Size = new System.Drawing.Size(195, 595);
this.tv.TabIndex = 16;
this.tv.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tv_NodeMouseClick);
//
@@ -467,16 +471,18 @@
this.panel1.Controls.Add(this.lblCaption);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(147, 20);
+ this.panel1.Size = new System.Drawing.Size(195, 24);
this.panel1.TabIndex = 15;
//
// lblCaption
//
this.lblCaption.AutoSize = true;
- this.lblCaption.Location = new System.Drawing.Point(0, 3);
+ this.lblCaption.Location = new System.Drawing.Point(0, 4);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(29, 12);
+ this.lblCaption.Size = new System.Drawing.Size(37, 15);
this.lblCaption.TabIndex = 0;
this.lblCaption.Text = "璧勬枡";
//
@@ -485,9 +491,10 @@
this.stTab.Controls.Add(this.tabPage1);
this.stTab.Dock = System.Windows.Forms.DockStyle.Fill;
this.stTab.Location = new System.Drawing.Point(0, 0);
+ this.stTab.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.stTab.Name = "stTab";
this.stTab.SelectedIndex = 0;
- this.stTab.Size = new System.Drawing.Size(786, 495);
+ this.stTab.Size = new System.Drawing.Size(1049, 619);
this.stTab.TabIndex = 15;
//
// tabPage1
@@ -495,10 +502,11 @@
this.tabPage1.BackColor = System.Drawing.Color.Transparent;
this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 22);
+ this.tabPage1.Location = new System.Drawing.Point(4, 25);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
- this.tabPage1.Size = new System.Drawing.Size(778, 469);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage1.Size = new System.Drawing.Size(1041, 590);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍒楄〃瑙嗗浘";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -511,21 +519,24 @@
this.grdMain.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(3, 3);
+ this.grdMain.Location = new System.Drawing.Point(4, 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;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(770, 461);
+ this.grdMain.Size = new System.Drawing.Size(1031, 580);
this.grdMain.TabIndex = 21;
//
// Gy_ProcPriceList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control;
- this.ClientSize = new System.Drawing.Size(937, 545);
+ this.ClientSize = new System.Drawing.Size(1249, 681);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.ToolBar);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Gy_ProcPriceList";
this.Text = "璧勬枡";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -534,6 +545,7 @@
this.ToolBar.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();
--
Gitblit v1.9.1