From dc9cf6b3219923162b6a665ed4b8db31bb09d9bc Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 18 五月 2022 09:11:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/导入模板/Gy_DataIn_StdWorkTimes.Designer.cs | 79 +++++++++++++++++----------------------
1 files changed, 35 insertions(+), 44 deletions(-)
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.Designer.cs" "b/BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.Designer.cs"
similarity index 70%
rename from "PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.Designer.cs"
rename to "BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.Designer.cs"
index 3eea509..c5564ae 100644
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_StdWorkTimes_RoutingBill.Designer.cs"
+++ "b/BaseSet/\345\257\274\345\205\245\346\250\241\346\235\277/Gy_DataIn_StdWorkTimes.Designer.cs"
@@ -1,6 +1,6 @@
-namespace PlanM
+namespace BaseSet
{
- partial class Gy_StdWorkTimes_RoutingBill
+ partial class Gy_DataIn_StdWorkTimes
{
/// <summary>
/// 必需的设计器变量。
@@ -41,8 +41,8 @@
//
// pPic
//
- this.pPic.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
- this.pPic.Size = new System.Drawing.Size(1544, 56);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.pPic.Size = new System.Drawing.Size(1158, 45);
//
// panel1
//
@@ -53,8 +53,8 @@
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.cmbHYear);
this.panel1.Controls.Add(this.label1);
- this.panel1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
- this.panel1.Size = new System.Drawing.Size(1544, 52);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel1.Size = new System.Drawing.Size(1158, 42);
this.panel1.Controls.SetChildIndex(this.cmdHPath, 0);
this.panel1.Controls.SetChildIndex(this.label4, 0);
this.panel1.Controls.SetChildIndex(this.txtHPath, 0);
@@ -68,33 +68,32 @@
//
// lblCaption
//
- this.lblCaption.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
- this.lblCaption.Size = new System.Drawing.Size(160, 24);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Size = new System.Drawing.Size(129, 19);
this.lblCaption.Text = "数据导入模块";
//
// cmdHPath
//
- this.cmdHPath.Location = new System.Drawing.Point(1043, 9);
- this.cmdHPath.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.cmdHPath.Location = new System.Drawing.Point(782, 7);
+ this.cmdHPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
//
// txtHPath
//
- this.txtHPath.Location = new System.Drawing.Point(615, 4);
- this.txtHPath.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
- this.txtHPath.Size = new System.Drawing.Size(419, 39);
+ this.txtHPath.Location = new System.Drawing.Point(461, 3);
+ this.txtHPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHPath.Size = new System.Drawing.Size(315, 32);
//
// label4
//
- this.label4.Location = new System.Drawing.Point(520, 15);
- this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label4.Location = new System.Drawing.Point(390, 12);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(35, 11);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(26, 9);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(67, 15);
+ this.label1.Size = new System.Drawing.Size(53, 12);
this.label1.TabIndex = 104;
this.label1.Text = "会计年：";
//
@@ -102,10 +101,9 @@
//
this.cmbHYear.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHYear.FormattingEnabled = true;
- this.cmbHYear.Location = new System.Drawing.Point(112, 10);
- this.cmbHYear.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbHYear.Location = new System.Drawing.Point(84, 8);
this.cmbHYear.Name = "cmbHYear";
- this.cmbHYear.Size = new System.Drawing.Size(124, 23);
+ this.cmbHYear.Size = new System.Drawing.Size(94, 20);
this.cmbHYear.TabIndex = 105;
//
// cmbHPeriod
@@ -125,62 +123,55 @@
"10",
"11",
"12"});
- this.cmbHPeriod.Location = new System.Drawing.Point(359, 12);
- this.cmbHPeriod.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmbHPeriod.Location = new System.Drawing.Point(269, 10);
this.cmbHPeriod.Name = "cmbHPeriod";
- this.cmbHPeriod.Size = new System.Drawing.Size(112, 23);
+ this.cmbHPeriod.Size = new System.Drawing.Size(85, 20);
this.cmbHPeriod.TabIndex = 107;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(264, 12);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(198, 10);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(82, 15);
+ this.label2.Size = new System.Drawing.Size(65, 12);
this.label2.TabIndex = 106;
this.label2.Text = "会计期间：";
//
// checkadd
//
this.checkadd.AutoSize = true;
- this.checkadd.Checked = true;
- this.checkadd.CheckState = System.Windows.Forms.CheckState.Checked;
- this.checkadd.Location = new System.Drawing.Point(1447, 12);
- this.checkadd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.checkadd.Location = new System.Drawing.Point(1085, 10);
this.checkadd.Name = "checkadd";
- this.checkadd.Size = new System.Drawing.Size(59, 19);
+ this.checkadd.Size = new System.Drawing.Size(48, 16);
this.checkadd.TabIndex = 108;
this.checkadd.Text = "追加";
this.checkadd.UseVisualStyleBackColor = true;
//
// txtHSheetName
//
- this.txtHSheetName.Location = new System.Drawing.Point(1265, 11);
- this.txtHSheetName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSheetName.Location = new System.Drawing.Point(949, 9);
this.txtHSheetName.Name = "txtHSheetName";
- this.txtHSheetName.Size = new System.Drawing.Size(132, 25);
+ this.txtHSheetName.Size = new System.Drawing.Size(100, 21);
this.txtHSheetName.TabIndex = 109;
this.txtHSheetName.Text = "Sheet1";
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(1203, 12);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(902, 10);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(52, 15);
+ this.label3.Size = new System.Drawing.Size(41, 12);
this.label3.TabIndex = 110;
this.label3.Text = "工作簿";
//
- // Gy_StdWorkTimes_RoutingBill
+ // Gy_DataIn_StdWorkTimes
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
- this.ClientSize = new System.Drawing.Size(1544, 789);
- this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
- this.Name = "Gy_StdWorkTimes_RoutingBill";
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.ClientSize = new System.Drawing.Size(1158, 631);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Name = "Gy_DataIn_StdWorkTimes";
this.Text = "数据导入模块";
- this.Load += new System.EventHandler(this.Gy_StdWorkTimes_RoutingBill_Load);
+ this.Load += new System.EventHandler(this.Gy_DataIn_StdWorkTimes_Load);
this.pPic.ResumeLayout(false);
this.pPic.PerformLayout();
this.panel1.ResumeLayout(false);
--
Gitblit v1.9.1