From c21cbafce8493740ad75ef8648e0d10d491d753e Mon Sep 17 00:00:00 2001 From: 杨乐 <yang.le.192@qq.com> Date: 星期五, 14 一月 2022 10:56:30 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- ProM/委外管理/WW_EntrustOrderBillList.designer.cs | 248 +++++++++++++++++++++++++++---------------------- 1 files changed, 138 insertions(+), 110 deletions(-) diff --git "a/ProM/\345\247\224\345\244\226\347\256\241\347\220\206/WW_EntrustOrderBillList.designer.cs" "b/ProM/\345\247\224\345\244\226\347\256\241\347\220\206/WW_EntrustOrderBillList.designer.cs" index 15d9053..86cb423 100644 --- "a/ProM/\345\247\224\345\244\226\347\256\241\347\220\206/WW_EntrustOrderBillList.designer.cs" +++ "b/ProM/\345\247\224\345\244\226\347\256\241\347\220\206/WW_EntrustOrderBillList.designer.cs" @@ -65,20 +65,20 @@ this.grdPrint = new System.Windows.Forms.DataGridView(); this.grdSum = new System.Windows.Forms.DataGridView(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.cmbHStatus = new System.Windows.Forms.ComboBox(); - this.label5 = new System.Windows.Forms.Label(); - this.dtpHBDate = new System.Windows.Forms.DateTimePicker(); - this.label2 = new System.Windows.Forms.Label(); - this.txtHSupID = new System.Windows.Forms.TextBox(); - this.dtpHEDate = new System.Windows.Forms.DateTimePicker(); - this.label4 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.btnOK = new System.Windows.Forms.Button(); - this.txtHBillNo = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); this.txtHBillNo2 = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); this.btnTB = new System.Windows.Forms.Button(); + this.cmbHStatus = new System.Windows.Forms.ComboBox(); + this.dtpHBDate = new System.Windows.Forms.DateTimePicker(); + this.txtHSupID = new System.Windows.Forms.TextBox(); + this.dtpHEDate = new System.Windows.Forms.DateTimePicker(); + this.txtHBillNo = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.btnOK = new System.Windows.Forms.Button(); + this.label3 = new System.Windows.Forms.Label(); this.pPic.SuspendLayout(); this.panel1.SuspendLayout(); this.Tool.SuspendLayout(); @@ -96,9 +96,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, 62); + this.pPic.Margin = new System.Windows.Forms.Padding(4); this.pPic.Name = "pPic"; - this.pPic.Size = new System.Drawing.Size(1406, 53); + this.pPic.Size = new System.Drawing.Size(1875, 66); this.pPic.TabIndex = 15; // // panel1 @@ -106,26 +107,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(1192, 0); + this.panel1.Location = new System.Drawing.Point(1590, 0); + this.panel1.Margin = new System.Windows.Forms.Padding(4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(214, 53); + this.panel1.Size = new System.Drawing.Size(285, 66); 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(32, 38); + 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(15, 15); 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(32, 15); + 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, 15); this.lbldj.TabIndex = 0; // // lblCaption @@ -135,9 +139,10 @@ 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.ForeColor = System.Drawing.Color.Black; - this.lblCaption.Location = new System.Drawing.Point(12, 15); + this.lblCaption.Location = new System.Drawing.Point(16, 19); + 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(124, 27); this.lblCaption.TabIndex = 4; this.lblCaption.Text = "鍗曟嵁鍒楄〃"; this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -175,7 +180,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(1406, 50); + this.Tool.Size = new System.Drawing.Size(1875, 62); this.Tool.Stretch = true; this.Tool.TabIndex = 16; this.Tool.Text = "toolStrip1"; @@ -198,7 +203,7 @@ // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50); + this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62); this.toolStripSeparator10.Visible = false; // // set @@ -247,7 +252,7 @@ // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50); + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62); // // xz // @@ -280,7 +285,7 @@ // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50); + this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62); // // cx // @@ -313,7 +318,7 @@ // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50); + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62); // // shc // @@ -347,7 +352,7 @@ // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50); + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62); // // fj // @@ -367,7 +372,7 @@ // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50); + this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62); this.toolStripSeparator6.Visible = false; // // tc @@ -388,7 +393,7 @@ // this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(6, 50); + this.toolStripSeparator11.Size = new System.Drawing.Size(6, 62); // // mrlk // @@ -398,7 +403,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; @@ -408,7 +413,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 // @@ -418,7 +423,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; @@ -428,7 +433,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, 62); // // timer1 // @@ -446,11 +451,13 @@ 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, 144); + this.grdMain.Location = new System.Drawing.Point(0, 179); + this.grdMain.Margin = new System.Windows.Forms.Padding(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(1406, 368); + this.grdMain.Size = new System.Drawing.Size(1875, 461); this.grdMain.TabIndex = 19; this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp); this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged); @@ -461,10 +468,12 @@ // 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(1029, 182); + this.grdPrint.Margin = new System.Windows.Forms.Padding(4); this.grdPrint.Name = "grdPrint"; + this.grdPrint.RowHeadersWidth = 51; this.grdPrint.RowTemplate.Height = 23; - this.grdPrint.Size = new System.Drawing.Size(25, 24); + this.grdPrint.Size = new System.Drawing.Size(33, 30); this.grdPrint.TabIndex = 8; this.grdPrint.Visible = false; // @@ -475,12 +484,14 @@ 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, 640); + this.grdSum.Margin = new System.Windows.Forms.Padding(4); this.grdSum.Name = "grdSum"; this.grdSum.ReadOnly = true; + this.grdSum.RowHeadersWidth = 51; this.grdSum.RowTemplate.Height = 23; this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None; - this.grdSum.Size = new System.Drawing.Size(1406, 19); + this.grdSum.Size = new System.Drawing.Size(1875, 24); this.grdSum.TabIndex = 47; // // groupBox1 @@ -501,11 +512,42 @@ this.groupBox1.Controls.Add(this.btnOK); this.groupBox1.Controls.Add(this.label3); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.groupBox1.Location = new System.Drawing.Point(0, 103); + this.groupBox1.Location = new System.Drawing.Point(0, 128); + this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(1406, 41); + this.groupBox1.Padding = new System.Windows.Forms.Padding(4); + this.groupBox1.Size = new System.Drawing.Size(1875, 51); this.groupBox1.TabIndex = 52; this.groupBox1.TabStop = false; + // + // txtHBillNo2 + // + this.txtHBillNo2.Location = new System.Drawing.Point(1507, 19); + this.txtHBillNo2.Margin = new System.Windows.Forms.Padding(4); + this.txtHBillNo2.Name = "txtHBillNo2"; + this.txtHBillNo2.Size = new System.Drawing.Size(172, 25); + this.txtHBillNo2.TabIndex = 30; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(1432, 24); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(67, 15); + this.label6.TabIndex = 29; + this.label6.Text = "鍗曟嵁鍙凤細"; + // + // btnTB + // + this.btnTB.Location = new System.Drawing.Point(1692, 16); + this.btnTB.Margin = new System.Windows.Forms.Padding(4); + this.btnTB.Name = "btnTB"; + this.btnTB.Size = new System.Drawing.Size(97, 30); + this.btnTB.TabIndex = 28; + this.btnTB.Text = "閲嶆柊鍚屾"; + this.btnTB.UseVisualStyleBackColor = true; + this.btnTB.Click += new System.EventHandler(this.btnTB_Click); // // cmbHStatus // @@ -517,137 +559,123 @@ "宸插鏍�", "鏈叧闂�", "宸插叧闂�"}); - this.cmbHStatus.Location = new System.Drawing.Point(48, 15); + this.cmbHStatus.Location = new System.Drawing.Point(64, 19); + this.cmbHStatus.Margin = new System.Windows.Forms.Padding(4); this.cmbHStatus.Name = "cmbHStatus"; - this.cmbHStatus.Size = new System.Drawing.Size(81, 20); + this.cmbHStatus.Size = new System.Drawing.Size(107, 23); this.cmbHStatus.TabIndex = 10; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(13, 19); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(41, 12); - this.label5.TabIndex = 9; - this.label5.Text = "鐘舵�侊細"; // // dtpHBDate // this.dtpHBDate.Checked = false; this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; - this.dtpHBDate.Location = new System.Drawing.Point(201, 15); + this.dtpHBDate.Location = new System.Drawing.Point(268, 19); + this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4); this.dtpHBDate.Name = "dtpHBDate"; this.dtpHBDate.ShowCheckBox = true; - this.dtpHBDate.Size = new System.Drawing.Size(122, 21); + this.dtpHBDate.Size = new System.Drawing.Size(161, 25); this.dtpHBDate.TabIndex = 3; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(142, 19); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(65, 12); - this.label2.TabIndex = 2; - this.label2.Text = "寮�濮嬫棩鏈燂細"; // // txtHSupID // - this.txtHSupID.Location = new System.Drawing.Point(798, 15); + this.txtHSupID.Location = new System.Drawing.Point(1064, 19); + this.txtHSupID.Margin = new System.Windows.Forms.Padding(4); this.txtHSupID.Name = "txtHSupID"; - this.txtHSupID.Size = new System.Drawing.Size(162, 21); + this.txtHSupID.Size = new System.Drawing.Size(215, 25); this.txtHSupID.TabIndex = 8; // // dtpHEDate // this.dtpHEDate.Checked = false; this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short; - this.dtpHEDate.Location = new System.Drawing.Point(395, 15); + this.dtpHEDate.Location = new System.Drawing.Point(527, 19); + this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4); this.dtpHEDate.Name = "dtpHEDate"; this.dtpHEDate.ShowCheckBox = true; - this.dtpHEDate.Size = new System.Drawing.Size(122, 21); + this.dtpHEDate.Size = new System.Drawing.Size(161, 25); this.dtpHEDate.TabIndex = 5; + // + // txtHBillNo + // + this.txtHBillNo.Location = new System.Drawing.Point(769, 19); + this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4); + this.txtHBillNo.Name = "txtHBillNo"; + this.txtHBillNo.Size = new System.Drawing.Size(215, 25); + this.txtHBillNo.TabIndex = 1; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(17, 24); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(52, 15); + this.label5.TabIndex = 9; + this.label5.Text = "鐘舵�侊細"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(189, 24); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(82, 15); + this.label2.TabIndex = 2; + this.label2.Text = "寮�濮嬫棩鏈燂細"; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(751, 19); + this.label4.Location = new System.Drawing.Point(1001, 24); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(53, 12); + this.label4.Size = new System.Drawing.Size(67, 15); this.label4.TabIndex = 7; this.label4.Text = "渚涘簲鍟嗭細"; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(530, 19); + this.label1.Location = new System.Drawing.Point(707, 24); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(53, 12); + this.label1.Size = new System.Drawing.Size(67, 15); this.label1.TabIndex = 0; this.label1.Text = "鍗曟嵁鍙凤細"; // // btnOK // - this.btnOK.Location = new System.Drawing.Point(968, 13); + this.btnOK.Location = new System.Drawing.Point(1291, 16); + this.btnOK.Margin = new System.Windows.Forms.Padding(4); this.btnOK.Name = "btnOK"; - this.btnOK.Size = new System.Drawing.Size(73, 24); + this.btnOK.Size = new System.Drawing.Size(97, 30); this.btnOK.TabIndex = 6; this.btnOK.Text = "蹇�熻繃婊�"; this.btnOK.UseVisualStyleBackColor = true; this.btnOK.Click += new System.EventHandler(this.btnOK_Click); // - // txtHBillNo - // - this.txtHBillNo.Location = new System.Drawing.Point(577, 15); - this.txtHBillNo.Name = "txtHBillNo"; - this.txtHBillNo.Size = new System.Drawing.Size(162, 21); - this.txtHBillNo.TabIndex = 1; - // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(336, 19); + this.label3.Location = new System.Drawing.Point(448, 24); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(65, 12); + this.label3.Size = new System.Drawing.Size(82, 15); this.label3.TabIndex = 4; this.label3.Text = "缁撴潫鏃ユ湡锛�"; // - // txtHBillNo2 - // - this.txtHBillNo2.Location = new System.Drawing.Point(1130, 15); - this.txtHBillNo2.Name = "txtHBillNo2"; - this.txtHBillNo2.Size = new System.Drawing.Size(130, 21); - this.txtHBillNo2.TabIndex = 30; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(1074, 19); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(53, 12); - this.label6.TabIndex = 29; - this.label6.Text = "鍗曟嵁鍙凤細"; - // - // btnTB - // - this.btnTB.Location = new System.Drawing.Point(1269, 13); - this.btnTB.Name = "btnTB"; - this.btnTB.Size = new System.Drawing.Size(73, 24); - this.btnTB.TabIndex = 28; - this.btnTB.Text = "閲嶆柊鍚屾"; - this.btnTB.UseVisualStyleBackColor = true; - this.btnTB.Click += new System.EventHandler(this.btnTB_Click); - // // WW_EntrustOrderBillList // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1406, 531); + this.ClientSize = new System.Drawing.Size(1875, 664); this.Controls.Add(this.grdMain); this.Controls.Add(this.groupBox1); this.Controls.Add(this.grdPrint); this.Controls.Add(this.grdSum); this.Controls.Add(this.pPic); this.Controls.Add(this.Tool); + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "WW_EntrustOrderBillList"; this.Text = "鍗曟嵁鍒楄〃"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; -- Gitblit v1.9.1