From a985c4d4b80fbf3eb4abbe385adcd0536fd29eda Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 22 十一月 2024 15:04:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs | 136 +++++++++++++++++++++++++++-----------------
1 files changed, 83 insertions(+), 53 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
index 5962ae0..7a40272 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
@@ -60,12 +60,14 @@
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
- this.txt_suppNo = new Gs.DevApp.UserControl.UcLookSupplier();
+ this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
this.lbGuid = new System.Windows.Forms.Label();
@@ -102,14 +104,14 @@
//
this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
- this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
+ this.gv_suppNo.Caption = "渚涘簲鍟咺D";
this.gv_suppNo.FieldName = "suppId";
this.gv_suppNo.MinWidth = 50;
this.gv_suppNo.Name = "gv_suppNo";
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.SUPP_NO";
this.gv_suppNo.Visible = true;
- this.gv_suppNo.VisibleIndex = 3;
+ this.gv_suppNo.VisibleIndex = 4;
this.gv_suppNo.Width = 94;
//
// lb_itemId
@@ -140,7 +142,7 @@
//
this.lb_status.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_status.Appearance.Options.UseFont = true;
- this.lb_status.Location = new System.Drawing.Point(286, 89);
+ this.lb_status.Location = new System.Drawing.Point(294, 89);
this.lb_status.Name = "lb_status";
this.lb_status.Size = new System.Drawing.Size(73, 21);
this.lb_status.TabIndex = 228;
@@ -156,15 +158,16 @@
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.STATUS";
+ this.gv_status.UnboundDataType = typeof(bool);
this.gv_status.Visible = true;
- this.gv_status.VisibleIndex = 8;
+ this.gv_status.VisibleIndex = 10;
this.gv_status.Width = 94;
//
// lb_checkDate
//
this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_checkDate.Appearance.Options.UseFont = true;
- this.lb_checkDate.Location = new System.Drawing.Point(528, 51);
+ this.lb_checkDate.Location = new System.Drawing.Point(541, 51);
this.lb_checkDate.Name = "lb_checkDate";
this.lb_checkDate.Size = new System.Drawing.Size(73, 21);
this.lb_checkDate.TabIndex = 226;
@@ -173,11 +176,11 @@
// txt_checkDate
//
this.txt_checkDate.Enabled = false;
- this.txt_checkDate.Location = new System.Drawing.Point(606, 47);
+ this.txt_checkDate.Location = new System.Drawing.Point(619, 47);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_checkDate.Size = new System.Drawing.Size(176, 28);
this.txt_checkDate.TabIndex = 226;
//
// gv_checkDate
@@ -186,19 +189,19 @@
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 50;
+ this.gv_checkDate.MinWidth = 120;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 10;
- this.gv_checkDate.Width = 94;
+ this.gv_checkDate.VisibleIndex = 12;
+ this.gv_checkDate.Width = 120;
//
// lb_checkUser
//
this.lb_checkUser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_checkUser.Appearance.Options.UseFont = true;
- this.lb_checkUser.Location = new System.Drawing.Point(545, 13);
+ this.lb_checkUser.Location = new System.Drawing.Point(558, 13);
this.lb_checkUser.Name = "lb_checkUser";
this.lb_checkUser.Size = new System.Drawing.Size(56, 21);
this.lb_checkUser.TabIndex = 222;
@@ -207,11 +210,11 @@
// txt_checkUser
//
this.txt_checkUser.Enabled = false;
- this.txt_checkUser.Location = new System.Drawing.Point(606, 9);
+ this.txt_checkUser.Location = new System.Drawing.Point(619, 9);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(150, 28);
+ this.txt_checkUser.Size = new System.Drawing.Size(176, 28);
this.txt_checkUser.TabIndex = 222;
//
// gv_checkUser
@@ -225,14 +228,14 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 9;
+ this.gv_checkUser.VisibleIndex = 11;
this.gv_checkUser.Width = 94;
//
// lb_lastupdateDate
//
this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdateDate.Appearance.Options.UseFont = true;
- this.lb_lastupdateDate.Location = new System.Drawing.Point(769, 51);
+ this.lb_lastupdateDate.Location = new System.Drawing.Point(798, 51);
this.lb_lastupdateDate.Name = "lb_lastupdateDate";
this.lb_lastupdateDate.Size = new System.Drawing.Size(107, 21);
this.lb_lastupdateDate.TabIndex = 219;
@@ -241,11 +244,11 @@
// txt_lastupdateDate
//
this.txt_lastupdateDate.Enabled = false;
- this.txt_lastupdateDate.Location = new System.Drawing.Point(882, 47);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(911, 47);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_lastupdateDate.Size = new System.Drawing.Size(166, 28);
this.txt_lastupdateDate.TabIndex = 219;
//
// gv_lastupdateDate
@@ -254,19 +257,19 @@
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂�";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 50;
+ this.gv_lastupdateDate.MinWidth = 120;
this.gv_lastupdateDate.Name = "gv_lastupdateDate";
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 7;
- this.gv_lastupdateDate.Width = 94;
+ this.gv_lastupdateDate.VisibleIndex = 9;
+ this.gv_lastupdateDate.Width = 120;
//
// lb_lastupdateBy
//
this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdateBy.Appearance.Options.UseFont = true;
- this.lb_lastupdateBy.Location = new System.Drawing.Point(786, 13);
+ this.lb_lastupdateBy.Location = new System.Drawing.Point(815, 13);
this.lb_lastupdateBy.Name = "lb_lastupdateBy";
this.lb_lastupdateBy.Size = new System.Drawing.Size(90, 21);
this.lb_lastupdateBy.TabIndex = 217;
@@ -275,11 +278,11 @@
// txt_lastupdateBy
//
this.txt_lastupdateBy.Enabled = false;
- this.txt_lastupdateBy.Location = new System.Drawing.Point(882, 9);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(911, 9);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateBy.Size = new System.Drawing.Size(150, 28);
+ this.txt_lastupdateBy.Size = new System.Drawing.Size(166, 28);
this.txt_lastupdateBy.TabIndex = 217;
//
// gv_lastupdateBy
@@ -293,14 +296,14 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 6;
+ this.gv_lastupdateBy.VisibleIndex = 8;
this.gv_lastupdateBy.Width = 94;
//
// lb_createDate
//
this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createDate.Appearance.Options.UseFont = true;
- this.lb_createDate.Location = new System.Drawing.Point(286, 51);
+ this.lb_createDate.Location = new System.Drawing.Point(294, 51);
this.lb_createDate.Name = "lb_createDate";
this.lb_createDate.Size = new System.Drawing.Size(73, 21);
this.lb_createDate.TabIndex = 216;
@@ -309,11 +312,11 @@
// txt_createDate
//
this.txt_createDate.Enabled = false;
- this.txt_createDate.Location = new System.Drawing.Point(365, 47);
+ this.txt_createDate.Location = new System.Drawing.Point(373, 47);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(166, 28);
this.txt_createDate.TabIndex = 216;
//
// gv_createDate
@@ -322,19 +325,19 @@
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 50;
+ this.gv_createDate.MinWidth = 120;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 5;
- this.gv_createDate.Width = 94;
+ this.gv_createDate.VisibleIndex = 7;
+ this.gv_createDate.Width = 120;
//
// lb_createBy
//
this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createBy.Appearance.Options.UseFont = true;
- this.lb_createBy.Location = new System.Drawing.Point(303, 13);
+ this.lb_createBy.Location = new System.Drawing.Point(311, 13);
this.lb_createBy.Name = "lb_createBy";
this.lb_createBy.Size = new System.Drawing.Size(56, 21);
this.lb_createBy.TabIndex = 213;
@@ -343,11 +346,11 @@
// txt_createBy
//
this.txt_createBy.Enabled = false;
- this.txt_createBy.Location = new System.Drawing.Point(365, 9);
+ this.txt_createBy.Location = new System.Drawing.Point(373, 9);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(150, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(166, 28);
this.txt_createBy.TabIndex = 213;
//
// gv_createBy
@@ -361,7 +364,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.CREATE_BY";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 4;
+ this.gv_createBy.VisibleIndex = 6;
this.gv_createBy.Width = 94;
//
// lb_itemNo
@@ -381,7 +384,7 @@
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(174, 28);
this.txt_itemNo.TabIndex = 211;
//
// gv_itemNo
@@ -395,7 +398,7 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.ITEM_NO";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 2;
+ this.gv_itemNo.VisibleIndex = 3;
this.gv_itemNo.Width = 94;
//
// toolBarMenu1
@@ -432,7 +435,9 @@
this.gridColumn1,
this.gv_itemId,
this.gv_itemNo,
+ this.gridColumn2,
this.gv_suppNo,
+ this.gridColumn3,
this.gv_createBy,
this.gv_createDate,
this.gv_lastupdateBy,
@@ -449,13 +454,36 @@
//
// gridColumn1
//
- this.gridColumn1.Caption = "缁勭粐";
+ this.gridColumn1.Caption = "浣跨敤缁勭粐";
this.gridColumn1.FieldName = "orgName";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 250;
this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 250;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn2.FieldName = "itemName";
+ this.gridColumn2.MinWidth = 125;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.AllowEdit = false;
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 2;
+ this.gridColumn2.Width = 125;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "渚涘簲鍟嗗悕绉�";
+ this.gridColumn3.FieldName = "gysName";
+ this.gridColumn3.MinWidth = 125;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.AllowEdit = false;
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 5;
+ this.gridColumn3.Width = 125;
//
// xtraTabControl1
//
@@ -501,7 +529,7 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_suppNo);
+ this.panel1.Controls.Add(this.txt_suppId);
this.panel1.Controls.Add(this.txt_itemId);
this.panel1.Controls.Add(this.txt_status);
this.panel1.Controls.Add(this.lbGuid);
@@ -525,18 +553,18 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(23, 20);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1052, 196);
+ this.panel1.Size = new System.Drawing.Size(1092, 196);
this.panel1.TabIndex = 1;
//
- // txt_suppNo
+ // txt_suppId
//
- this.txt_suppNo.IsReadly = false;
- this.txt_suppNo.KeyFile = "";
- this.txt_suppNo.Location = new System.Drawing.Point(114, 90);
- this.txt_suppNo.Margin = new System.Windows.Forms.Padding(0);
- this.txt_suppNo.Name = "txt_suppNo";
- this.txt_suppNo.Size = new System.Drawing.Size(150, 30);
- this.txt_suppNo.TabIndex = 238;
+ this.txt_suppId.IsReadly = false;
+ this.txt_suppId.KeyFile = "";
+ this.txt_suppId.Location = new System.Drawing.Point(114, 90);
+ this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_suppId.Name = "txt_suppId";
+ this.txt_suppId.Size = new System.Drawing.Size(174, 30);
+ this.txt_suppId.TabIndex = 238;
//
// txt_itemId
//
@@ -544,14 +572,14 @@
this.txt_itemId.KeyFile = "";
this.txt_itemId.Location = new System.Drawing.Point(114, 12);
this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(150, 33);
+ this.txt_itemId.Size = new System.Drawing.Size(174, 33);
this.txt_itemId.TabIndex = 237;
this.txt_itemId.Tag = "no";
//
// txt_status
//
this.txt_status.Enabled = false;
- this.txt_status.Location = new System.Drawing.Point(364, 87);
+ this.txt_status.Location = new System.Drawing.Point(372, 87);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "";
this.txt_status.Size = new System.Drawing.Size(94, 24);
@@ -654,9 +682,11 @@
private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
private DevExpress.XtraEditors.CheckEdit txt_status;
- private UserControl.UcLookSupplier txt_suppNo;
+ private UserControl.UcLookSupplier txt_suppId;
private UserControl.UcLookItems txt_itemId;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
--
Gitblit v1.9.3