From 8dbc06ffc555112cccbcbc1d32d4aa87fddf44ee Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 03 一月 2025 08:29:56 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 2
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 40 ++-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 2
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs | 13
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 87 ++++---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 449 +++++++++++++++++++++-------------------
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 21 +
8 files changed, 341 insertions(+), 277 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index a645fe4..48985a7 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 0702e87..1386a5a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -100,6 +100,8 @@
this.gv_fsubmit = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_modify1Flag = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_fcheckResu = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_lotNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
@@ -126,8 +128,6 @@
this.gv_fcheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_checkQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gv_fcheckResu = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_freceQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
@@ -689,13 +689,13 @@
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Enabled = false;
this.txt_fbatchQty.Location = new System.Drawing.Point(702, 44);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
this.txt_fbatchQty.Size = new System.Drawing.Size(66, 28);
this.txt_fbatchQty.TabIndex = 222;
+ this.txt_fbatchQty.Tag = "readonly";
//
// lb_fcheckBy
//
@@ -709,13 +709,13 @@
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Enabled = false;
this.txt_fcheckBy.Location = new System.Drawing.Point(452, 44);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
this.txt_fcheckBy.Size = new System.Drawing.Size(150, 28);
this.txt_fcheckBy.TabIndex = 217;
+ this.txt_fcheckBy.Tag = "readonly";
//
// lb_fcheckDate
//
@@ -729,13 +729,13 @@
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Enabled = false;
this.txt_fcheckDate.Location = new System.Drawing.Point(452, 10);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
this.txt_fcheckDate.Size = new System.Drawing.Size(150, 28);
this.txt_fcheckDate.TabIndex = 216;
+ this.txt_fcheckDate.Tag = "readonly";
//
// lb_releaseNo
//
@@ -749,13 +749,13 @@
//
// txt_releaseNo
//
- this.txt_releaseNo.Enabled = false;
this.txt_releaseNo.Location = new System.Drawing.Point(97, 10);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
this.txt_releaseNo.Size = new System.Drawing.Size(266, 28);
this.txt_releaseNo.TabIndex = 213;
+ this.txt_releaseNo.Tag = "readonly";
//
// toolBarMenu1
//
@@ -797,6 +797,7 @@
this.gridBand11,
this.gridBand12,
this.gridBand13,
+ this.gridBand9,
this.gridBand14,
this.gridBand16,
this.gridBand18,
@@ -925,7 +926,8 @@
this.gridBand13.Columns.Add(this.gv_modify1Flag);
this.gridBand13.MinWidth = 50;
this.gridBand13.Name = "gridBand13";
- this.gridBand13.VisibleIndex = 3;
+ this.gridBand13.Visible = false;
+ this.gridBand13.VisibleIndex = -1;
this.gridBand13.Width = 50;
//
// gv_modify1Flag
@@ -941,6 +943,30 @@
this.gv_modify1Flag.UnboundDataType = typeof(bool);
this.gv_modify1Flag.Visible = true;
this.gv_modify1Flag.Width = 50;
+ //
+ // gridBand9
+ //
+ this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand9.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand9.Caption = "妫�楠岀粨鏋�";
+ this.gridBand9.Columns.Add(this.gv_fcheckResu);
+ this.gridBand9.MinWidth = 50;
+ this.gridBand9.Name = "gridBand9";
+ this.gridBand9.VisibleIndex = 3;
+ this.gridBand9.Width = 50;
+ //
+ // gv_fcheckResu
+ //
+ this.gv_fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
+ this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
+ this.gv_fcheckResu.FieldName = "fcheckResu";
+ this.gv_fcheckResu.MinWidth = 30;
+ this.gv_fcheckResu.Name = "gv_fcheckResu";
+ this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
+ this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
+ this.gv_fcheckResu.Visible = true;
+ this.gv_fcheckResu.Width = 50;
//
// gridBand14
//
@@ -1165,12 +1191,11 @@
this.gridBand10,
this.gridBand32,
this.gridBand6,
- this.gridBand9,
this.gridBand15});
this.gridBand8.MinWidth = 300;
this.gridBand8.Name = "gridBand8";
this.gridBand8.VisibleIndex = 11;
- this.gridBand8.Width = 360;
+ this.gridBand8.Width = 300;
//
// gridBand10
//
@@ -1179,7 +1204,7 @@
this.gridBand10.MinWidth = 60;
this.gridBand10.Name = "gridBand10";
this.gridBand10.VisibleIndex = 0;
- this.gridBand10.Width = 93;
+ this.gridBand10.Width = 118;
//
// gv_fcheckBy
//
@@ -1192,7 +1217,7 @@
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.Width = 93;
+ this.gv_fcheckBy.Width = 118;
//
// gridBand32
//
@@ -1200,7 +1225,7 @@
this.gridBand32.Columns.Add(this.gv_fcheckDate);
this.gridBand32.Name = "gridBand32";
this.gridBand32.VisibleIndex = 1;
- this.gridBand32.Width = 143;
+ this.gridBand32.Width = 182;
//
// gv_fcheckDate
//
@@ -1213,7 +1238,7 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.Width = 143;
+ this.gv_fcheckDate.Width = 182;
//
// gridBand6
//
@@ -1237,28 +1262,6 @@
this.gv_checkQty.Tag = "query_a.check_qty";
this.gv_checkQty.Visible = true;
this.gv_checkQty.Width = 50;
- //
- // gridBand9
- //
- this.gridBand9.Caption = "妫�楠岀粨鏋�";
- this.gridBand9.Columns.Add(this.gv_fcheckResu);
- this.gridBand9.MinWidth = 50;
- this.gridBand9.Name = "gridBand9";
- this.gridBand9.VisibleIndex = 2;
- this.gridBand9.Width = 124;
- //
- // gv_fcheckResu
- //
- this.gv_fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
- this.gv_fcheckResu.FieldName = "fcheckResu";
- this.gv_fcheckResu.MinWidth = 30;
- this.gv_fcheckResu.Name = "gv_fcheckResu";
- this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
- this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
- this.gv_fcheckResu.Visible = true;
- this.gv_fcheckResu.Width = 124;
//
// gridBand15
//
@@ -1789,16 +1792,17 @@
this.txt_suppName.Name = "txt_suppName";
this.txt_suppName.Size = new System.Drawing.Size(309, 24);
this.txt_suppName.TabIndex = 801;
+ this.txt_suppName.Tag = "readonly";
//
// txt_itemName
//
- this.txt_itemName.Enabled = false;
this.txt_itemName.Location = new System.Drawing.Point(97, 44);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
this.txt_itemName.Size = new System.Drawing.Size(266, 28);
this.txt_itemName.TabIndex = 800;
+ this.txt_itemName.Tag = "readonly";
//
// labelControl4
//
@@ -1812,11 +1816,11 @@
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Enabled = false;
this.txt_fcheckResu.Location = new System.Drawing.Point(452, 78);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Size = new System.Drawing.Size(150, 24);
this.txt_fcheckResu.TabIndex = 798;
+ this.txt_fcheckResu.Tag = "readonly";
//
// txt_lotNo1
//
@@ -1857,14 +1861,13 @@
//
// txt_itemModel
//
- this.txt_itemModel.Enabled = false;
this.txt_itemModel.Location = new System.Drawing.Point(97, 109);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
this.txt_itemModel.Size = new System.Drawing.Size(266, 64);
this.txt_itemModel.TabIndex = 792;
- this.txt_itemModel.Tag = "itemName";
+ this.txt_itemModel.Tag = "readonly";
//
// lb_itemModel
//
@@ -1888,13 +1891,13 @@
//
// txt_itemNo
//
- this.txt_itemNo.Enabled = false;
this.txt_itemNo.Location = new System.Drawing.Point(97, 76);
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(266, 28);
this.txt_itemNo.TabIndex = 789;
+ this.txt_itemNo.Tag = "readonly";
//
// labelControl1
//
@@ -1957,13 +1960,13 @@
//
// txt_lotNo
//
- this.txt_lotNo.Enabled = false;
this.txt_lotNo.Location = new System.Drawing.Point(702, 10);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo.TabIndex = 262;
+ this.txt_lotNo.Tag = "readonly";
//
// picCheckBox
//
@@ -2171,6 +2174,7 @@
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand11;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand12;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand9;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand16;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand18;
@@ -2185,7 +2189,6 @@
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand32;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand9;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand23;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand26;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index ace60d5..d272fb2 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -34,7 +34,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "qualityAudit", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fsubmitTxt", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index e341042..0d225c4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -64,7 +64,7 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMxTui = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
@@ -77,20 +77,39 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
+ this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_fType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_urgentFlag = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_fstatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_depotsCode = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_suppNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_remark = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_checkUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -115,25 +134,7 @@
this.lbGuid = new System.Windows.Forms.Label();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
- this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -155,6 +156,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// gvMx1returnFlag
@@ -426,7 +428,7 @@
this.gridColumn9,
this.gridColumn7,
this.gvMx1memo,
- this.gvMxTui,
+ this.gvBtnAlawys,
this.gvMxDel});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -507,15 +509,15 @@
this.gridColumn7.VisibleIndex = 14;
this.gridColumn7.Width = 60;
//
- // gvMxTui
+ // gvBtnAlawys
//
- this.gvMxTui.Caption = "鎿嶄綔";
- this.gvMxTui.ColumnEdit = this.repositoryItemButtonEdit2;
- this.gvMxTui.MinWidth = 80;
- this.gvMxTui.Name = "gvMxTui";
- this.gvMxTui.Visible = true;
- this.gvMxTui.VisibleIndex = 16;
- this.gvMxTui.Width = 80;
+ this.gvBtnAlawys.Caption = "鎿嶄綔";
+ this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
+ this.gvBtnAlawys.MinWidth = 80;
+ this.gvBtnAlawys.Name = "gvBtnAlawys";
+ this.gvBtnAlawys.Visible = true;
+ this.gvBtnAlawys.VisibleIndex = 16;
+ this.gvBtnAlawys.Width = 80;
//
// repositoryItemButtonEdit2
//
@@ -600,13 +602,14 @@
//
// txt_billNo
//
- this.txt_billNo.Enabled = false;
this.txt_billNo.Location = new System.Drawing.Point(401, 16);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_billNo.Properties.Tag = "";
this.txt_billNo.Size = new System.Drawing.Size(215, 28);
this.txt_billNo.TabIndex = 213;
+ this.txt_billNo.Tag = "readOnly";
//
// toolBarMenu1
//
@@ -679,6 +682,14 @@
this.gridView1.OptionsView.ShowColumnHeaders = false;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridBand19
+ //
+ this.gridBand19.Caption = "鏀舵枡缁勭粐";
+ this.gridBand19.Columns.Add(this.bandedGridColumn1);
+ this.gridBand19.Name = "gridBand19";
+ this.gridBand19.VisibleIndex = 0;
+ this.gridBand19.Width = 250;
+ //
// bandedGridColumn1
//
this.bandedGridColumn1.Caption = "鏀舵枡缁勭粐";
@@ -690,6 +701,15 @@
this.bandedGridColumn1.Tag = "org.fnamber";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.Width = 250;
+ //
+ // gridBand1
+ //
+ this.gridBand1.Caption = "濮斿";
+ this.gridBand1.Columns.Add(this.gv_fType);
+ this.gridBand1.MinWidth = 50;
+ this.gridBand1.Name = "gridBand1";
+ this.gridBand1.VisibleIndex = 1;
+ this.gridBand1.Width = 50;
//
// gv_fType
//
@@ -706,6 +726,15 @@
this.gv_fType.Visible = true;
this.gv_fType.Width = 50;
//
+ // gridBand2
+ //
+ this.gridBand2.Caption = "鎬ユ枡";
+ this.gridBand2.Columns.Add(this.gv_urgentFlag);
+ this.gridBand2.MinWidth = 50;
+ this.gridBand2.Name = "gridBand2";
+ this.gridBand2.VisibleIndex = 2;
+ this.gridBand2.Width = 50;
+ //
// gv_urgentFlag
//
this.gv_urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -718,6 +747,17 @@
this.gv_urgentFlag.UnboundDataType = typeof(bool);
this.gv_urgentFlag.Visible = true;
this.gv_urgentFlag.Width = 50;
+ //
+ // gridBand3
+ //
+ this.gridBand3.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand3.Caption = "鎻愪氦妫�楠�";
+ this.gridBand3.Columns.Add(this.gv_fstatus);
+ this.gridBand3.MinWidth = 50;
+ this.gridBand3.Name = "gridBand3";
+ this.gridBand3.VisibleIndex = 3;
+ this.gridBand3.Width = 50;
//
// gv_fstatus
//
@@ -732,6 +772,15 @@
this.gv_fstatus.Visible = true;
this.gv_fstatus.Width = 50;
//
+ // gridBand4
+ //
+ this.gridBand4.Caption = "鍏ュ簱";
+ this.gridBand4.Columns.Add(this.gridColumn2);
+ this.gridBand4.MinWidth = 50;
+ this.gridBand4.Name = "gridBand4";
+ this.gridBand4.VisibleIndex = 4;
+ this.gridBand4.Width = 50;
+ //
// gridColumn2
//
this.gridColumn2.Caption = "鍏ュ簱";
@@ -742,6 +791,15 @@
this.gridColumn2.UnboundDataType = typeof(bool);
this.gridColumn2.Visible = true;
this.gridColumn2.Width = 50;
+ //
+ // gridBand5
+ //
+ this.gridBand5.Caption = "鍒拌揣鍗曞彿";
+ this.gridBand5.Columns.Add(this.gv_billNo);
+ this.gridBand5.MinWidth = 150;
+ this.gridBand5.Name = "gridBand5";
+ this.gridBand5.VisibleIndex = 5;
+ this.gridBand5.Width = 150;
//
// gv_billNo
//
@@ -755,6 +813,27 @@
this.gv_billNo.Visible = true;
this.gv_billNo.Width = 20;
//
+ // gridBand6
+ //
+ this.gridBand6.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand6.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand6.Caption = "鍒涘缓淇℃伅";
+ this.gridBand6.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand7,
+ this.gridBand8});
+ this.gridBand6.Name = "gridBand6";
+ this.gridBand6.VisibleIndex = 6;
+ this.gridBand6.Width = 265;
+ //
+ // gridBand7
+ //
+ this.gridBand7.Caption = "鍒涘缓浜哄憳";
+ this.gridBand7.Columns.Add(this.gv_createBy);
+ this.gridBand7.MinWidth = 60;
+ this.gridBand7.Name = "gridBand7";
+ this.gridBand7.VisibleIndex = 0;
+ this.gridBand7.Width = 85;
+ //
// gv_createBy
//
this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -766,6 +845,15 @@
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.Width = 85;
+ //
+ // gridBand8
+ //
+ this.gridBand8.Caption = "鍒涘缓鏃ユ湡";
+ this.gridBand8.Columns.Add(this.gv_createDate);
+ this.gridBand8.MinWidth = 180;
+ this.gridBand8.Name = "gridBand8";
+ this.gridBand8.VisibleIndex = 1;
+ this.gridBand8.Width = 180;
//
// gv_createDate
//
@@ -779,6 +867,27 @@
this.gv_createDate.Visible = true;
this.gv_createDate.Width = 180;
//
+ // gridBand9
+ //
+ this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand9.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand9.Caption = "鏀惰揣淇℃伅";
+ this.gridBand9.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand10,
+ this.gridBand11});
+ this.gridBand9.Name = "gridBand9";
+ this.gridBand9.VisibleIndex = 7;
+ this.gridBand9.Width = 233;
+ //
+ // gridBand10
+ //
+ this.gridBand10.Caption = "浠撳簱缂栧彿";
+ this.gridBand10.Columns.Add(this.gv_depotsCode);
+ this.gridBand10.MinWidth = 80;
+ this.gridBand10.Name = "gridBand10";
+ this.gridBand10.VisibleIndex = 0;
+ this.gridBand10.Width = 83;
+ //
// gv_depotsCode
//
this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -791,6 +900,15 @@
this.gv_depotsCode.Visible = true;
this.gv_depotsCode.Width = 83;
//
+ // gridBand11
+ //
+ this.gridBand11.Caption = "浠撳簱鍚嶇О";
+ this.gridBand11.Columns.Add(this.gridColumn4);
+ this.gridBand11.MinWidth = 150;
+ this.gridBand11.Name = "gridBand11";
+ this.gridBand11.VisibleIndex = 1;
+ this.gridBand11.Width = 150;
+ //
// gridColumn4
//
this.gridColumn4.Caption = "鏀惰揣浠撳簱鍚嶇О";
@@ -799,6 +917,27 @@
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.Visible = true;
this.gridColumn4.Width = 119;
+ //
+ // gridBand13
+ //
+ this.gridBand13.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand13.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand13.Caption = "渚涘簲鍟嗕俊鎭�";
+ this.gridBand13.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand12,
+ this.gridBand14});
+ this.gridBand13.Name = "gridBand13";
+ this.gridBand13.VisibleIndex = 8;
+ this.gridBand13.Width = 281;
+ //
+ // gridBand12
+ //
+ this.gridBand12.Caption = "渚涘簲鍟嗙紪鍙�";
+ this.gridBand12.Columns.Add(this.gv_suppNo);
+ this.gridBand12.MinWidth = 80;
+ this.gridBand12.Name = "gridBand12";
+ this.gridBand12.VisibleIndex = 0;
+ this.gridBand12.Width = 81;
//
// gv_suppNo
//
@@ -812,6 +951,15 @@
this.gv_suppNo.Visible = true;
this.gv_suppNo.Width = 81;
//
+ // gridBand14
+ //
+ this.gridBand14.Caption = "渚涘簲鍟嗗悕绉�";
+ this.gridBand14.Columns.Add(this.gridColumn5);
+ this.gridBand14.MinWidth = 200;
+ this.gridBand14.Name = "gridBand14";
+ this.gridBand14.VisibleIndex = 1;
+ this.gridBand14.Width = 200;
+ //
// gridColumn5
//
this.gridColumn5.Caption = "渚涘簲鍟嗗悕绉�";
@@ -820,6 +968,15 @@
this.gridColumn5.OptionsColumn.AllowEdit = false;
this.gridColumn5.Visible = true;
this.gridColumn5.Width = 49;
+ //
+ // gridBand16
+ //
+ this.gridBand16.Caption = "澶囨敞";
+ this.gridBand16.Columns.Add(this.gv_remark);
+ this.gridBand16.MinWidth = 180;
+ this.gridBand16.Name = "gridBand16";
+ this.gridBand16.VisibleIndex = 9;
+ this.gridBand16.Width = 180;
//
// gv_remark
//
@@ -833,6 +990,27 @@
this.gv_remark.Visible = true;
this.gv_remark.Width = 85;
//
+ // gridBand18
+ //
+ this.gridBand18.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand18.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand18.Caption = "妫�楠屼俊鎭�";
+ this.gridBand18.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand15,
+ this.gridBand17});
+ this.gridBand18.Name = "gridBand18";
+ this.gridBand18.VisibleIndex = 10;
+ this.gridBand18.Width = 479;
+ //
+ // gridBand15
+ //
+ this.gridBand15.Caption = "鎻愪氦浜�";
+ this.gridBand15.Columns.Add(this.gv_checkUser);
+ this.gridBand15.MinWidth = 60;
+ this.gridBand15.Name = "gridBand15";
+ this.gridBand15.VisibleIndex = 0;
+ this.gridBand15.Width = 106;
+ //
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -844,6 +1022,15 @@
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
this.gv_checkUser.Width = 106;
+ //
+ // gridBand17
+ //
+ this.gridBand17.Caption = "鎻愪氦鏃ユ湡";
+ this.gridBand17.Columns.Add(this.gv_checkDate);
+ this.gridBand17.MinWidth = 180;
+ this.gridBand17.Name = "gridBand17";
+ this.gridBand17.VisibleIndex = 1;
+ this.gridBand17.Width = 373;
//
// gv_checkDate
//
@@ -971,19 +1158,20 @@
//
// txtDepotsCode
//
- this.txtDepotsCode.Enabled = false;
this.txtDepotsCode.Location = new System.Drawing.Point(402, 87);
this.txtDepotsCode.Name = "txtDepotsCode";
this.txtDepotsCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtDepotsCode.Properties.Appearance.Options.UseFont = true;
+ this.txtDepotsCode.Properties.Tag = "";
this.txtDepotsCode.Size = new System.Drawing.Size(215, 28);
this.txtDepotsCode.TabIndex = 454;
+ this.txtDepotsCode.Tag = "readOnly";
//
// labelControl4
//
this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl4.Appearance.Options.UseFont = true;
- this.labelControl4.Location = new System.Drawing.Point(329, 91);
+ this.labelControl4.Location = new System.Drawing.Point(329, 94);
this.labelControl4.Name = "labelControl4";
this.labelControl4.Size = new System.Drawing.Size(68, 21);
this.labelControl4.TabIndex = 453;
@@ -991,13 +1179,14 @@
//
// txtSupplierCode
//
- this.txtSupplierCode.Enabled = false;
this.txtSupplierCode.Location = new System.Drawing.Point(401, 51);
this.txtSupplierCode.Name = "txtSupplierCode";
this.txtSupplierCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
+ this.txtSupplierCode.Properties.Tag = "";
this.txtSupplierCode.Size = new System.Drawing.Size(215, 28);
this.txtSupplierCode.TabIndex = 451;
+ this.txtSupplierCode.Tag = "readOnly";
//
// txt_fType
//
@@ -1101,193 +1290,23 @@
this.txt_remark.Size = new System.Drawing.Size(522, 28);
this.txt_remark.TabIndex = 240;
//
- // gridBand19
+ // picCheckBox
//
- this.gridBand19.Caption = "鏀舵枡缁勭粐";
- this.gridBand19.Columns.Add(this.bandedGridColumn1);
- this.gridBand19.Name = "gridBand19";
- this.gridBand19.VisibleIndex = 0;
- this.gridBand19.Width = 250;
- //
- // gridBand1
- //
- this.gridBand1.Caption = "濮斿";
- this.gridBand1.Columns.Add(this.gv_fType);
- this.gridBand1.MinWidth = 50;
- this.gridBand1.Name = "gridBand1";
- this.gridBand1.VisibleIndex = 1;
- this.gridBand1.Width = 50;
- //
- // gridBand2
- //
- this.gridBand2.Caption = "鎬ユ枡";
- this.gridBand2.Columns.Add(this.gv_urgentFlag);
- this.gridBand2.MinWidth = 50;
- this.gridBand2.Name = "gridBand2";
- this.gridBand2.VisibleIndex = 2;
- this.gridBand2.Width = 50;
- //
- // gridBand3
- //
- this.gridBand3.Caption = "妫�楠�";
- this.gridBand3.Columns.Add(this.gv_fstatus);
- this.gridBand3.MinWidth = 50;
- this.gridBand3.Name = "gridBand3";
- this.gridBand3.VisibleIndex = 3;
- this.gridBand3.Width = 50;
- //
- // gridBand4
- //
- this.gridBand4.Caption = "鍏ュ簱";
- this.gridBand4.Columns.Add(this.gridColumn2);
- this.gridBand4.MinWidth = 50;
- this.gridBand4.Name = "gridBand4";
- this.gridBand4.VisibleIndex = 4;
- this.gridBand4.Width = 50;
- //
- // gridBand5
- //
- this.gridBand5.Caption = "鍒拌揣鍗曞彿";
- this.gridBand5.Columns.Add(this.gv_billNo);
- this.gridBand5.MinWidth = 150;
- this.gridBand5.Name = "gridBand5";
- this.gridBand5.VisibleIndex = 5;
- this.gridBand5.Width = 150;
- //
- // gridBand6
- //
- this.gridBand6.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand6.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand6.Caption = "鍒涘缓淇℃伅";
- this.gridBand6.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand7,
- this.gridBand8});
- this.gridBand6.Name = "gridBand6";
- this.gridBand6.VisibleIndex = 6;
- this.gridBand6.Width = 265;
- //
- // gridBand7
- //
- this.gridBand7.Caption = "鍒涘缓浜哄憳";
- this.gridBand7.Columns.Add(this.gv_createBy);
- this.gridBand7.MinWidth = 60;
- this.gridBand7.Name = "gridBand7";
- this.gridBand7.VisibleIndex = 0;
- this.gridBand7.Width = 85;
- //
- // gridBand8
- //
- this.gridBand8.Caption = "鍒涘缓鏃ユ湡";
- this.gridBand8.Columns.Add(this.gv_createDate);
- this.gridBand8.MinWidth = 180;
- this.gridBand8.Name = "gridBand8";
- this.gridBand8.VisibleIndex = 1;
- this.gridBand8.Width = 180;
- //
- // gridBand9
- //
- this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand9.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand9.Caption = "鏀惰揣淇℃伅";
- this.gridBand9.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand10,
- this.gridBand11});
- this.gridBand9.Name = "gridBand9";
- this.gridBand9.VisibleIndex = 7;
- this.gridBand9.Width = 233;
- //
- // gridBand10
- //
- this.gridBand10.Caption = "浠撳簱缂栧彿";
- this.gridBand10.Columns.Add(this.gv_depotsCode);
- this.gridBand10.MinWidth = 80;
- this.gridBand10.Name = "gridBand10";
- this.gridBand10.VisibleIndex = 0;
- this.gridBand10.Width = 83;
- //
- // gridBand11
- //
- this.gridBand11.Caption = "浠撳簱鍚嶇О";
- this.gridBand11.Columns.Add(this.gridColumn4);
- this.gridBand11.MinWidth = 150;
- this.gridBand11.Name = "gridBand11";
- this.gridBand11.VisibleIndex = 1;
- this.gridBand11.Width = 150;
- //
- // gridBand13
- //
- this.gridBand13.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand13.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand13.Caption = "渚涘簲鍟嗕俊鎭�";
- this.gridBand13.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand12,
- this.gridBand14});
- this.gridBand13.Name = "gridBand13";
- this.gridBand13.VisibleIndex = 8;
- this.gridBand13.Width = 281;
- //
- // gridBand12
- //
- this.gridBand12.Caption = "渚涘簲鍟嗙紪鍙�";
- this.gridBand12.Columns.Add(this.gv_suppNo);
- this.gridBand12.MinWidth = 80;
- this.gridBand12.Name = "gridBand12";
- this.gridBand12.VisibleIndex = 0;
- this.gridBand12.Width = 81;
- //
- // gridBand14
- //
- this.gridBand14.Caption = "渚涘簲鍟嗗悕绉�";
- this.gridBand14.Columns.Add(this.gridColumn5);
- this.gridBand14.MinWidth = 200;
- this.gridBand14.Name = "gridBand14";
- this.gridBand14.VisibleIndex = 1;
- this.gridBand14.Width = 200;
- //
- // gridBand16
- //
- this.gridBand16.Caption = "澶囨敞";
- this.gridBand16.Columns.Add(this.gv_remark);
- this.gridBand16.MinWidth = 180;
- this.gridBand16.Name = "gridBand16";
- this.gridBand16.VisibleIndex = 9;
- this.gridBand16.Width = 180;
- //
- // gridBand18
- //
- this.gridBand18.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand18.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand18.Caption = "妫�楠屼俊鎭�";
- this.gridBand18.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand15,
- this.gridBand17});
- this.gridBand18.Name = "gridBand18";
- this.gridBand18.VisibleIndex = 10;
- this.gridBand18.Width = 479;
- //
- // gridBand15
- //
- this.gridBand15.Caption = "鎻愪氦浜�";
- this.gridBand15.Columns.Add(this.gv_checkUser);
- this.gridBand15.MinWidth = 60;
- this.gridBand15.Name = "gridBand15";
- this.gridBand15.VisibleIndex = 0;
- this.gridBand15.Width = 106;
- //
- // gridBand17
- //
- this.gridBand17.Caption = "鎻愪氦鏃ユ湡";
- this.gridBand17.Columns.Add(this.gv_checkDate);
- this.gridBand17.MinWidth = 180;
- this.gridBand17.Name = "gridBand17";
- this.gridBand17.VisibleIndex = 1;
- this.gridBand17.Width = 373;
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(924, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 6;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
//
// Frm_MesInvItemArn
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1233, 682);
+ this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesInvItemArn";
@@ -1314,6 +1333,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -1395,7 +1415,7 @@
private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraEditors.LabelControl labelControl5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraGrid.Columns.GridColumn gvMxTui;
+ private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand19;
@@ -1417,5 +1437,6 @@
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand18;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand17;
+ private System.Windows.Forms.PictureBox picCheckBox;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 0c2209f..994ed2b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -34,7 +34,7 @@
toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fstatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs
index fcbafa1..1cb4597 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs
@@ -586,13 +586,13 @@
//
// txt_bl016
//
- this.txt_bl016.Enabled = false;
this.txt_bl016.Location = new System.Drawing.Point(852, 16);
this.txt_bl016.Name = "txt_bl016";
this.txt_bl016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_bl016.Properties.Appearance.Options.UseFont = true;
this.txt_bl016.Size = new System.Drawing.Size(81, 28);
this.txt_bl016.TabIndex = 267;
+ this.txt_bl016.Tag = "readonly";
//
// gv_bl016
//
@@ -620,13 +620,13 @@
//
// txt_bl015
//
- this.txt_bl015.Enabled = false;
this.txt_bl015.Location = new System.Drawing.Point(852, 50);
this.txt_bl015.Name = "txt_bl015";
this.txt_bl015.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_bl015.Properties.Appearance.Options.UseFont = true;
this.txt_bl015.Size = new System.Drawing.Size(229, 28);
this.txt_bl015.TabIndex = 262;
+ this.txt_bl015.Tag = "readonly";
//
// gv_bl015
//
@@ -654,13 +654,13 @@
//
// txt_bl014
//
- this.txt_bl014.Enabled = false;
this.txt_bl014.Location = new System.Drawing.Point(606, 50);
this.txt_bl014.Name = "txt_bl014";
this.txt_bl014.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_bl014.Properties.Appearance.Options.UseFont = true;
this.txt_bl014.Size = new System.Drawing.Size(160, 28);
this.txt_bl014.TabIndex = 258;
+ this.txt_bl014.Tag = "readonly";
//
// gv_bl014
//
@@ -688,13 +688,13 @@
//
// txt_bl013
//
- this.txt_bl013.Enabled = false;
this.txt_bl013.Location = new System.Drawing.Point(360, 16);
this.txt_bl013.Name = "txt_bl013";
this.txt_bl013.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_bl013.Properties.Appearance.Options.UseFont = true;
this.txt_bl013.Size = new System.Drawing.Size(150, 28);
this.txt_bl013.TabIndex = 252;
+ this.txt_bl013.Tag = "readonly";
//
// gv_bl013
//
@@ -793,13 +793,13 @@
//
// txt_bl006
//
- this.txt_bl006.Enabled = false;
this.txt_bl006.Location = new System.Drawing.Point(606, 16);
this.txt_bl006.Name = "txt_bl006";
this.txt_bl006.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_bl006.Properties.Appearance.Options.UseFont = true;
this.txt_bl006.Size = new System.Drawing.Size(160, 28);
this.txt_bl006.TabIndex = 226;
+ this.txt_bl006.Tag = "readonly";
//
// gv_bl006
//
@@ -855,13 +855,13 @@
//
// txt_bl002
//
- this.txt_bl002.Enabled = false;
this.txt_bl002.Location = new System.Drawing.Point(360, 50);
this.txt_bl002.Name = "txt_bl002";
this.txt_bl002.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_bl002.Properties.Appearance.Options.UseFont = true;
this.txt_bl002.Size = new System.Drawing.Size(150, 28);
this.txt_bl002.TabIndex = 216;
+ this.txt_bl002.Tag = "readonly";
//
// gv_bl002
//
@@ -920,6 +920,7 @@
this.txt_blNo.Properties.Tag = "readOnly";
this.txt_blNo.Size = new System.Drawing.Size(150, 28);
this.txt_blNo.TabIndex = 211;
+ this.txt_blNo.Tag = "readonly";
//
// gv_blNo
//
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 96ea59a..d1ef474 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -646,6 +646,21 @@
MessageBox.Show(ex.Message);
}
}
+
+ foreach (Control ctrl in controls)
+ {
+ if (ctrl is TextEdit)
+ {
+ var txt = ctrl as TextEdit;
+ if (_isRead(txt.Tag))
+ {
+ txt.ReadOnly = true;
+ }
+ else
+ txt.ReadOnly = isEdt;
+ continue;
+ }
+ }
}
/// <summary>
@@ -1532,9 +1547,15 @@
btnChkIco.Text = checkStatus;
btnChkIco.Visible = true;
if (checkStatus == "1" || checkStatus.ToUpper() == true.ToString().ToUpper())
+ {
btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_check;
+ btnChkIco.Tag = "宸插鏍�";
+ }
else
+ {
btnChkIco.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ btnChkIco.Tag = "鏈鏍�";
+ }
btnChkIco.Anchor = AnchorStyles.Top | AnchorStyles.Right; // 闈犲彸
btnChkIco.Location = new Point(fm.ClientSize.Width - btnChkIco.Width - 20, 80); // 璺濈椤堕儴10鍍忕礌
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index b971c8b..77356cc 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -67,6 +67,23 @@
if (Parent != null) getNamespace();
}
+ private bool _isCk() {
+ Form parentForm = this.FindForm();
+ if (parentForm != null)
+ {
+ PictureBox specificControl = (PictureBox)parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
+ if (specificControl != null)
+ {
+ if (specificControl.Tag.ToString() == "宸插鏍�")
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ュ崟鎹凡琚鏍革紝鏃犳硶杩涜鎿嶄綔锛�");
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnBoHuiClick != null)
@@ -182,6 +199,8 @@
private void BtnChk_ItemClick(object sender, ItemClickEventArgs e)
{
+ bool bl = _isCk();
+ if (bl) return;
if (btnChkClick != null)
{
btnChkClick(this, e);
@@ -249,6 +268,8 @@
private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
{
+ bool bl = _isCk();
+ if (bl) return;
if (btnJianYanClick != null)
btnJianYanClick(this, e);
else
@@ -490,6 +511,8 @@
private void BtnEdit_ItemClick(object sender, ItemClickEventArgs e)
{
+ bool bl = _isCk();
+ if (bl) return;
var lst = new List<string>();
lst.Add(btnSave.Name);
lst.Add(btnEsc.Name);
@@ -497,19 +520,13 @@
_enabledBtn(lst);
this.currentAction = "edit";
if (btnEdtClick != null) btnEdtClick(this, e);
- Form parentForm = this.FindForm();
- if (parentForm != null)
- {
- Control specificControl = parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
- if (specificControl != null)
- {
- specificControl.Visible = false;
- }
- }
+
}
private void BtnDel_ItemClick(object sender, ItemClickEventArgs e)
{
+ bool bl = _isCk();
+ if (bl) return;
if (btnDelClick != null) btnDelClick(this, e);
}
@@ -529,10 +546,11 @@
Form parentForm = this.FindForm();
if (parentForm != null)
{
- Control specificControl = parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
+ PictureBox specificControl =(PictureBox) parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
if (specificControl != null)
{
- specificControl.Visible = false;
+ specificControl.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ specificControl.Tag = "鏈鏍�";
}
}
}
--
Gitblit v1.9.3