From ba6d2fff0224e8694c782a7e1154d0abd7a32c20 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 17 十一月 2021 08:48:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
EAM/模具管理/模具维修管理/Sc_MouldConkBookBillList.designer.cs | 87 ++++++++++++++++++++++++-------------------
1 files changed, 49 insertions(+), 38 deletions(-)
diff --git "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\273\264\344\277\256\347\256\241\347\220\206/Sc_MouldConkBookBillList.designer.cs" "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\273\264\344\277\256\347\256\241\347\220\206/Sc_MouldConkBookBillList.designer.cs"
index e539f97..eb1a71e 100644
--- "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\273\264\344\277\256\347\256\241\347\220\206/Sc_MouldConkBookBillList.designer.cs"
+++ "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\347\273\264\344\277\256\347\256\241\347\220\206/Sc_MouldConkBookBillList.designer.cs"
@@ -86,9 +86,10 @@
this.pPic.Controls.Add(this.panel1);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 50);
+ this.pPic.Location = new System.Drawing.Point(0, 75);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(906, 53);
+ this.pPic.Size = new System.Drawing.Size(1359, 80);
this.pPic.TabIndex = 15;
//
// panel1
@@ -96,26 +97,29 @@
this.panel1.Controls.Add(this.lbljl);
this.panel1.Controls.Add(this.lbldj);
this.panel1.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel1.Location = new System.Drawing.Point(692, 0);
+ this.panel1.Location = new System.Drawing.Point(1038, 0);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(214, 53);
+ this.panel1.Size = new System.Drawing.Size(321, 80);
this.panel1.TabIndex = 7;
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(24, 30);
+ this.lbljl.Location = new System.Drawing.Point(36, 45);
+ this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(11, 12);
+ this.lbljl.Size = new System.Drawing.Size(17, 18);
this.lbljl.TabIndex = 1;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(24, 12);
+ this.lbldj.Location = new System.Drawing.Point(36, 18);
+ this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 12);
+ this.lbldj.Size = new System.Drawing.Size(0, 18);
this.lbldj.TabIndex = 0;
//
// lblCaption
@@ -124,9 +128,10 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblCaption.Location = new System.Drawing.Point(12, 15);
+ this.lblCaption.Location = new System.Drawing.Point(18, 22);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(98, 21);
+ this.lblCaption.Size = new System.Drawing.Size(147, 33);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "鍗曟嵁鍒楄〃";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -169,7 +174,7 @@
this.Tool.Location = new System.Drawing.Point(0, 0);
this.Tool.Name = "Tool";
this.Tool.Padding = new System.Windows.Forms.Padding(0);
- this.Tool.Size = new System.Drawing.Size(906, 50);
+ this.Tool.Size = new System.Drawing.Size(1359, 75);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -191,7 +196,7 @@
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 75);
//
// set
//
@@ -238,7 +243,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 75);
//
// cx
//
@@ -271,7 +276,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 75);
//
// shc
//
@@ -305,7 +310,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 75);
//
// xz
//
@@ -352,7 +357,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 75);
//
// sh
//
@@ -385,7 +390,7 @@
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
- this.toolStripSeparator11.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 75);
//
// xt
//
@@ -396,7 +401,7 @@
this.xt.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.xt.ImageTransparentColor = System.Drawing.Color.White;
this.xt.Name = "xt";
- this.xt.Size = new System.Drawing.Size(45, 47);
+ this.xt.Size = new System.Drawing.Size(64, 70);
this.xt.Text = "涓嬫帹";
this.xt.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.xt.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -404,14 +409,13 @@
// 浜у搧鍏ュ簱鍗昑oolStripMenuItem
//
this.浜у搧鍏ュ簱鍗昑oolStripMenuItem.Name = "浜у搧鍏ュ簱鍗昑oolStripMenuItem";
- this.浜у搧鍏ュ簱鍗昑oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.浜у搧鍏ュ簱鍗昑oolStripMenuItem.Size = new System.Drawing.Size(200, 34);
this.浜у搧鍏ュ簱鍗昑oolStripMenuItem.Text = "浜у搧鍏ュ簱鍗�";
- //this.浜у搧鍏ュ簱鍗昑oolStripMenuItem.Click += new System.EventHandler(this.浜у搧鍏ュ簱鍗昑oolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 75);
//
// tc
//
@@ -430,13 +434,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 75);
//
// toolStripSeparator9
//
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, 75);
//
// mrlk
//
@@ -446,7 +450,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(86, 70);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -456,7 +460,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, 75);
//
// bclk
//
@@ -466,7 +470,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(86, 70);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -476,7 +480,7 @@
//
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, 75);
//
// timer1
//
@@ -494,27 +498,31 @@
this.grdMain.BackgroundColor = System.Drawing.SystemColors.InactiveCaption;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 103);
+ this.grdMain.Location = new System.Drawing.Point(0, 155);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 62;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(906, 409);
+ this.grdMain.Size = new System.Drawing.Size(1359, 613);
this.grdMain.TabIndex = 19;
+ this.grdMain.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellContentClick);
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
- this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
- this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
+ this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
//
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(772, 146);
+ this.grdPrint.Location = new System.Drawing.Point(1158, 219);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 62;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(25, 24);
+ this.grdPrint.Size = new System.Drawing.Size(38, 36);
this.grdPrint.TabIndex = 8;
this.grdPrint.Visible = false;
- //this.grdPrint.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdPrint_CellContentClick);
//
// grdSum
//
@@ -523,24 +531,27 @@
this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(0, 512);
+ this.grdSum.Location = new System.Drawing.Point(0, 768);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 62;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(906, 19);
+ this.grdSum.Size = new System.Drawing.Size(1359, 28);
this.grdSum.TabIndex = 47;
//
// Sc_MouldConkBookBillList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(906, 531);
+ this.ClientSize = new System.Drawing.Size(1359, 796);
this.Controls.Add(this.grdPrint);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Sc_MouldConkBookBillList";
this.Text = "鍗曟嵁鍒楄〃";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
--
Gitblit v1.9.1