From 2b3750fda8303e8322ab146778dfc7ad47e75d31 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 13 八月 2025 10:23:53 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 114 ++++++++++++++--------------
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs | 34 ++++----
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 16 ++--
DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs | 39 +++++----
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 29 ++++---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 1
6 files changed, 123 insertions(+), 110 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index a24636d..04b4705 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -373,7 +373,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 5;
+ this.gridColumn3.VisibleIndex = 6;
this.gridColumn3.Width = 94;
//
// gv_qt020
@@ -386,7 +386,7 @@
this.gv_qt020.OptionsColumn.AllowEdit = false;
this.gv_qt020.Tag = "query_a.qt020";
this.gv_qt020.Visible = true;
- this.gv_qt020.VisibleIndex = 6;
+ this.gv_qt020.VisibleIndex = 7;
this.gv_qt020.Width = 94;
//
// gridColumn4
@@ -396,7 +396,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 7;
+ this.gridColumn4.VisibleIndex = 13;
this.gridColumn4.Width = 94;
//
// gv_qt005
@@ -435,7 +435,7 @@
this.gv_qt008.OptionsColumn.AllowEdit = false;
this.gv_qt008.Tag = "query_a.qt008";
this.gv_qt008.Visible = true;
- this.gv_qt008.VisibleIndex = 10;
+ this.gv_qt008.VisibleIndex = 5;
this.gv_qt008.Width = 94;
//
// gv_qt010
@@ -448,7 +448,7 @@
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
- this.gv_qt010.VisibleIndex = 11;
+ this.gv_qt010.VisibleIndex = 10;
this.gv_qt010.Width = 94;
//
// gv_qt016
@@ -461,7 +461,7 @@
this.gv_qt016.OptionsColumn.AllowEdit = false;
this.gv_qt016.Tag = "query_a.qt016";
this.gv_qt016.Visible = true;
- this.gv_qt016.VisibleIndex = 12;
+ this.gv_qt016.VisibleIndex = 11;
this.gv_qt016.Width = 94;
//
// gv_qt002
@@ -474,7 +474,7 @@
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
- this.gv_qt002.VisibleIndex = 13;
+ this.gv_qt002.VisibleIndex = 12;
this.gv_qt002.Width = 94;
//
// gridColumn5
@@ -1485,7 +1485,7 @@
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(952, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(971, 27);
this.picCheckBox.Name = "picCheckBox";
this.picCheckBox.Size = new System.Drawing.Size(100, 50);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index f0d6a28..ea0ab06 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -279,7 +279,6 @@
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
ucLookHuoZhu1.Enabled = true;
-
//澧炲姞鏃讹紝榛樿缁勭粐
string deftOrg = UtilityHelper.GetFirstOrg(txt_qt023);
string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
@@ -317,12 +316,12 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨璐т富锛�");
return;
}
- if (txt_qt019.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
- txt_qt019.Focus();
- return;
- }
+ //if (txt_qt019.SelectedIndex <= 0)
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+ // txt_qt019.Focus();
+ // return;
+ //}
if (string.IsNullOrEmpty(inLyOrg))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨棰嗙敤缁勭粐锛�");
@@ -675,10 +674,18 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
}
- int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
- gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
+ else
+ {
+ //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+ getPageList(this.pageBar1.CurrentPage);
+ int rowHandle = gridView1.LocateByValue("guid", rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ }
+
}
else
MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
@@ -775,7 +782,5 @@
};
frm.ShowDialog();
}
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
index ded1164..5b97f88 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
@@ -356,7 +356,7 @@
this.gv_outDate.OptionsColumn.AllowEdit = false;
this.gv_outDate.Tag = "query_a.out_date";
this.gv_outDate.Visible = true;
- this.gv_outDate.VisibleIndex = 3;
+ this.gv_outDate.VisibleIndex = 5;
this.gv_outDate.Width = 120;
//
// gv_outType
@@ -369,7 +369,7 @@
this.gv_outType.OptionsColumn.AllowEdit = false;
this.gv_outType.Tag = "query_a.out_type";
this.gv_outType.Visible = true;
- this.gv_outType.VisibleIndex = 4;
+ this.gv_outType.VisibleIndex = 6;
this.gv_outType.Width = 94;
//
// gv_checkUser
@@ -382,7 +382,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 5;
+ this.gv_checkUser.VisibleIndex = 7;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
@@ -395,7 +395,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 6;
+ this.gv_checkDate.VisibleIndex = 8;
this.gv_checkDate.Width = 120;
//
// gv_receiver
@@ -408,7 +408,7 @@
this.gv_receiver.OptionsColumn.AllowEdit = false;
this.gv_receiver.Tag = "query_a.receiver";
this.gv_receiver.Visible = true;
- this.gv_receiver.VisibleIndex = 7;
+ this.gv_receiver.VisibleIndex = 9;
this.gv_receiver.Width = 94;
//
// gv_outPart
@@ -421,7 +421,7 @@
this.gv_outPart.OptionsColumn.AllowEdit = false;
this.gv_outPart.Tag = "query_a.out_part";
this.gv_outPart.Visible = true;
- this.gv_outPart.VisibleIndex = 8;
+ this.gv_outPart.VisibleIndex = 10;
this.gv_outPart.Width = 94;
//
// gv_createBy
@@ -434,7 +434,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 9;
+ this.gv_createBy.VisibleIndex = 11;
this.gv_createBy.Width = 94;
//
// gv_createDate
@@ -447,7 +447,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 10;
+ this.gv_createDate.VisibleIndex = 12;
this.gv_createDate.Width = 94;
//
// gv_remark
@@ -460,7 +460,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 11;
+ this.gv_remark.VisibleIndex = 13;
this.gv_remark.Width = 94;
//
// gridColumn1
@@ -478,7 +478,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 12;
+ this.gridColumn6.VisibleIndex = 14;
this.gridColumn6.Width = 94;
//
// gridColumn8
@@ -488,7 +488,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 13;
+ this.gridColumn8.VisibleIndex = 15;
this.gridColumn8.Width = 94;
//
// gridColumn10
@@ -498,7 +498,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 14;
+ this.gridColumn10.VisibleIndex = 16;
this.gridColumn10.Width = 94;
//
// gridColumn11
@@ -508,7 +508,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 15;
+ this.gridColumn11.VisibleIndex = 17;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -518,7 +518,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 16;
+ this.gridColumn12.VisibleIndex = 18;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -528,7 +528,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 17;
+ this.gridColumn13.VisibleIndex = 19;
this.gridColumn13.Width = 94;
//
// gridColumn7
@@ -538,7 +538,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 18;
+ this.gridColumn7.VisibleIndex = 3;
this.gridColumn7.Width = 94;
//
// gridColumn14
@@ -548,7 +548,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 19;
+ this.gridColumn14.VisibleIndex = 4;
this.gridColumn14.Width = 94;
//
// pageBar1
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 443263a..3e064ff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -113,6 +113,7 @@
this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit();
this.txt_isIqc = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -135,7 +136,6 @@
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -249,6 +249,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -271,7 +272,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -469,7 +469,7 @@
this.gv_qt003.OptionsColumn.AllowEdit = false;
this.gv_qt003.Tag = "query_a.qt003";
this.gv_qt003.Visible = true;
- this.gv_qt003.VisibleIndex = 4;
+ this.gv_qt003.VisibleIndex = 12;
this.gv_qt003.Width = 94;
//
// gv_qt019
@@ -482,7 +482,7 @@
this.gv_qt019.OptionsColumn.AllowEdit = false;
this.gv_qt019.Tag = "query_a.qt019";
this.gv_qt019.Visible = true;
- this.gv_qt019.VisibleIndex = 5;
+ this.gv_qt019.VisibleIndex = 13;
this.gv_qt019.Width = 94;
//
// gv_qt005
@@ -495,7 +495,7 @@
this.gv_qt005.OptionsColumn.AllowEdit = false;
this.gv_qt005.Tag = "query_a.qt005";
this.gv_qt005.Visible = true;
- this.gv_qt005.VisibleIndex = 6;
+ this.gv_qt005.VisibleIndex = 4;
this.gv_qt005.Width = 94;
//
// gv_qt001
@@ -508,7 +508,7 @@
this.gv_qt001.OptionsColumn.AllowEdit = false;
this.gv_qt001.Tag = "query_a.qt001";
this.gv_qt001.Visible = true;
- this.gv_qt001.VisibleIndex = 7;
+ this.gv_qt001.VisibleIndex = 5;
this.gv_qt001.Width = 200;
//
// gv_qt016
@@ -521,7 +521,7 @@
this.gv_qt016.OptionsColumn.AllowEdit = false;
this.gv_qt016.Tag = "query_a.qt016";
this.gv_qt016.Visible = true;
- this.gv_qt016.VisibleIndex = 8;
+ this.gv_qt016.VisibleIndex = 9;
this.gv_qt016.Width = 94;
//
// gv_qt002
@@ -534,7 +534,7 @@
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
- this.gv_qt002.VisibleIndex = 9;
+ this.gv_qt002.VisibleIndex = 10;
this.gv_qt002.Width = 180;
//
// gv_qt010
@@ -547,7 +547,7 @@
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
- this.gv_qt010.VisibleIndex = 10;
+ this.gv_qt010.VisibleIndex = 11;
this.gv_qt010.Width = 94;
//
// gridColumn13
@@ -557,7 +557,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 11;
+ this.gridColumn13.VisibleIndex = 14;
this.gridColumn13.Width = 94;
//
// gridColumn14
@@ -567,7 +567,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 12;
+ this.gridColumn14.VisibleIndex = 15;
this.gridColumn14.Width = 94;
//
// gridColumn21
@@ -577,7 +577,7 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 13;
+ this.gridColumn21.VisibleIndex = 16;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -587,7 +587,7 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 14;
+ this.gridColumn22.VisibleIndex = 6;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -597,7 +597,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 15;
+ this.gridColumn23.VisibleIndex = 7;
this.gridColumn23.Width = 94;
//
// gridColumn24
@@ -607,7 +607,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 16;
+ this.gridColumn24.VisibleIndex = 8;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -953,6 +953,18 @@
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
//
+ // layoutControlItem36
+ //
+ this.layoutControlItem36.Control = this.txt_isIqc;
+ this.layoutControlItem36.Location = new System.Drawing.Point(328, 143);
+ this.layoutControlItem36.Name = "layoutControlItem36";
+ this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem36.Size = new System.Drawing.Size(328, 29);
+ this.layoutControlItem36.Text = "iqc鏍囪瘑";
+ this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem36.TextVisible = false;
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -1246,18 +1258,6 @@
this.layoutControlItem14.Text = "鐢宠浜哄憳";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem36
- //
- this.layoutControlItem36.Control = this.txt_isIqc;
- this.layoutControlItem36.Location = new System.Drawing.Point(328, 143);
- this.layoutControlItem36.Name = "layoutControlItem36";
- this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem36.Size = new System.Drawing.Size(328, 29);
- this.layoutControlItem36.Text = "iqc鏍囪瘑";
- this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem36.TextVisible = false;
- //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1335,11 +1335,11 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 48);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 49);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(336, 33);
this.ucBtnPrint1.TabIndex = 480;
//
// radOut
@@ -1353,7 +1353,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(336, 32);
+ this.radOut.Size = new System.Drawing.Size(336, 33);
this.radOut.StyleController = this.lay99;
this.radOut.TabIndex = 479;
//
@@ -1361,10 +1361,10 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 84);
+ this.layoutControl1.Location = new System.Drawing.Point(692, 86);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 32);
+ this.layoutControl1.Size = new System.Drawing.Size(336, 33);
this.layoutControl1.TabIndex = 478;
this.layoutControl1.Text = "layoutControl1";
//
@@ -1408,7 +1408,7 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 32);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 33);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem33
@@ -1416,7 +1416,7 @@
this.layoutControlItem33.Control = this.txt_iCount_1;
this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.Size = new System.Drawing.Size(168, 32);
+ this.layoutControlItem33.Size = new System.Drawing.Size(168, 33);
this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1426,7 +1426,7 @@
this.layoutControlItem34.Location = new System.Drawing.Point(168, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem34.Size = new System.Drawing.Size(168, 32);
+ this.layoutControlItem34.Size = new System.Drawing.Size(168, 33);
this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1444,7 +1444,7 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 48);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 49);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
@@ -1463,7 +1463,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 48);
+ this.txt_yQty.Location = new System.Drawing.Point(454, 49);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
@@ -1483,7 +1483,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 48);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 49);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
@@ -1493,7 +1493,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 84);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 86);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
@@ -1553,7 +1553,7 @@
rowDefinition8,
rowDefinition9,
rowDefinition10});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 131);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -1562,7 +1562,7 @@
this.layoutControlItem23.Location = new System.Drawing.Point(1020, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem23.Text = "鎵撳嵃鏂瑰紡";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1570,11 +1570,11 @@
// layoutControlItem22
//
this.layoutControlItem22.Control = this.layoutControl1;
- this.layoutControlItem22.Location = new System.Drawing.Point(680, 72);
+ this.layoutControlItem22.Location = new System.Drawing.Point(680, 74);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem22.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem22.Text = "鎵撳嵃寮犳暟";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -1587,7 +1587,7 @@
this.layoutControlItem27.Location = new System.Drawing.Point(680, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem27.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem27.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1596,11 +1596,11 @@
this.layoutControlItem28.Control = this.txt_psnQty_1;
this.layoutControlItem28.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem28.CustomizationFormText = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem28.Location = new System.Drawing.Point(680, 36);
+ this.layoutControlItem28.Location = new System.Drawing.Point(680, 37);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem28.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem28.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1612,7 +1612,7 @@
this.layoutControlItem25.Location = new System.Drawing.Point(340, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1621,11 +1621,11 @@
this.layoutControlItem26.Control = this.txt_yQty;
this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem26.CustomizationFormText = "宸叉墦鍗版�婚噺";
- this.layoutControlItem26.Location = new System.Drawing.Point(340, 36);
+ this.layoutControlItem26.Location = new System.Drawing.Point(340, 37);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem26.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1636,7 +1636,7 @@
this.layoutControlItem24.CustomizationFormText = "鐗╂枡缂栫爜";
this.layoutControlItem24.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem24.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem24.Text = "鐗╂枡缂栫爜";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1645,10 +1645,10 @@
this.layoutControlItem29.Control = this.txtWlmc;
this.layoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem29.CustomizationFormText = "鐗╂枡鍚嶇О";
- this.layoutControlItem29.Location = new System.Drawing.Point(0, 36);
+ this.layoutControlItem29.Location = new System.Drawing.Point(0, 37);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem29.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem29.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem29.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1657,22 +1657,22 @@
this.layoutControlItem30.Control = this.txtWlgg;
this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem30.CustomizationFormText = "鐗╂枡瑙勬牸";
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 72);
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 74);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem30.Size = new System.Drawing.Size(680, 36);
+ this.layoutControlItem30.Size = new System.Drawing.Size(680, 37);
this.layoutControlItem30.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.ucBtnPrint1;
- this.layoutControlItem31.Location = new System.Drawing.Point(1020, 36);
+ this.layoutControlItem31.Location = new System.Drawing.Point(1020, 37);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem31.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem31.Size = new System.Drawing.Size(340, 37);
this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem31.TextVisible = false;
@@ -2248,6 +2248,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -2270,7 +2271,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index c206f49..c116ced 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -795,6 +795,7 @@
}
else
txt.ReadOnly = isEdt;
+ txt.Checked = false;
continue;
}
//鑷畾涔変粨搴�
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
index c65a597..34b78f4 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
@@ -28,11 +28,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -41,6 +41,7 @@
this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -49,7 +50,6 @@
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
@@ -62,14 +62,14 @@
//
// gridView1
//
-
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_operationTime,
this.gv_operationTable,
this.gv_msg,
this.gv_userName,
- this.gv_Btn});
+ this.gv_Btn,
+ this.gridColumn1});
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -78,7 +78,6 @@
//
// gv_operationTime
//
-
this.gv_operationTime.AppearanceCell.Options.UseFont = true;
this.gv_operationTime.Caption = "浠撳簱鍚嶇О";
this.gv_operationTime.FieldName = "depotName";
@@ -92,7 +91,6 @@
//
// gv_operationTable
//
-
this.gv_operationTable.AppearanceCell.Options.UseFont = true;
this.gv_operationTable.Caption = "浠撳簱缂栧彿";
this.gv_operationTable.FieldName = "depotCode";
@@ -106,7 +104,6 @@
//
// gv_msg
//
-
this.gv_msg.AppearanceCell.Options.UseFont = true;
this.gv_msg.Caption = "浣跨敤鐘舵��";
this.gv_msg.FieldName = "isNg";
@@ -120,7 +117,6 @@
//
// gv_userName
//
-
this.gv_userName.AppearanceCell.Options.UseFont = true;
this.gv_userName.Caption = "鍚屾鏃堕棿";
this.gv_userName.FieldName = "edtTime";
@@ -137,19 +133,29 @@
this.gv_Btn.MinWidth = 25;
this.gv_Btn.Name = "gv_Btn";
this.gv_Btn.Visible = true;
- this.gv_Btn.VisibleIndex = 3;
+ this.gv_Btn.VisibleIndex = 4;
this.gv_Btn.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "Mes浠撳簱灞炴��";
+ this.gridColumn1.FieldName = "remark5";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.Width = 94;
//
// SelectCk
//
@@ -180,5 +186,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3