From dae72e4ae96b80a296a986c32f8c468c0b5605c2 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 02 一月 2025 18:22:37 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.Designer.cs | 320 ++++++++++++++++----------------------------
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs | 18 +-
DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs | 16 ++
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs | 1
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs | 8
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 48 ++++--
6 files changed, 176 insertions(+), 235 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs
index d5d9e05..fcbafa1 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.Designer.cs
@@ -29,11 +29,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.gvMx1bld014 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1bld012 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
@@ -482,10 +482,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ 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);
@@ -913,11 +913,11 @@
//
// txt_blNo
//
- this.txt_blNo.Enabled = false;
this.txt_blNo.Location = new System.Drawing.Point(112, 16);
this.txt_blNo.Name = "txt_blNo";
this.txt_blNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_blNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_blNo.Properties.Tag = "readOnly";
this.txt_blNo.Size = new System.Drawing.Size(150, 28);
this.txt_blNo.TabIndex = 211;
//
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs
index 02f6f54..c97181f 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwBl.cs
@@ -56,6 +56,7 @@
txt_bl002.Text = txt_aboutGuid.GetPrdNo();
txt_bl014.Text = txt_aboutGuid.GetPrdName();
txt_bl015.Text = txt_aboutGuid.GetPrdModel();
+ txt_bl013.Text = txt_aboutGuid.GetRwd();
var _obj = new
{
currentPage = 1,
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.Designer.cs
index e453824..3a7ed90 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.Designer.cs
@@ -29,15 +29,23 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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();
this.gvMx1bld014 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1bld012 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
this.repositoryItemSearchLookUpEdit1View = 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.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1bld010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1bld009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1bld008 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -57,7 +65,6 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gv_wcTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_wcUser = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_bl019 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_bl018 = new DevExpress.XtraEditors.LabelControl();
this.gv_bl018 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -74,12 +81,9 @@
this.lb_bl013 = new DevExpress.XtraEditors.LabelControl();
this.txt_bl013 = new DevExpress.XtraEditors.TextEdit();
this.gv_bl013 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_bl012 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_bl011 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_bl010 = new DevExpress.XtraEditors.LabelControl();
this.gv_bl010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_bl009 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_bl008 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_bl007 = new DevExpress.XtraEditors.LabelControl();
this.txt_bl007 = new DevExpress.XtraEditors.TextEdit();
this.gv_bl007 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -88,7 +92,6 @@
this.gv_bl006 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_bl005 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_bl004 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_bl003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_bl002 = new DevExpress.XtraEditors.LabelControl();
this.txt_bl002 = new DevExpress.XtraEditors.TextEdit();
this.gv_bl002 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -109,20 +112,12 @@
this.panel1 = new System.Windows.Forms.Panel();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.txt_aboutGuid = new Gs.DevApp.UserControl.UcLookWwgd();
- this.txt_bl017 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_bl008 = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_bl018 = new DevExpress.XtraEditors.CheckEdit();
this.txt_bl010 = new Gs.DevApp.UserControl.UcLookCk();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
this.tabMxPage1.SuspendLayout();
@@ -146,7 +141,7 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_bl017.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_bl008.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl018.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
@@ -207,6 +202,66 @@
this.repositoryItemSearchLookUpEdit1View.Name = "repositoryItemSearchLookUpEdit1View";
this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "gridColumn1";
+ this.gridColumn1.FieldName = "dabGuid";
+ this.gridColumn1.Name = "gridColumn1";
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "gridColumn2";
+ this.gridColumn2.FieldName = "itemId";
+ this.gridColumn2.Name = "gridColumn2";
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鐗╂枡缂栧彿";
+ this.gridColumn3.FieldName = "itemNo";
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 0;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn4.FieldName = "itemName";
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 1;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn5.FieldName = "itemModel";
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 2;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "闇�棰嗙敤閲�";
+ this.gridColumn6.FieldName = "dab006";
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 3;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "宸查鐢ㄩ噺";
+ this.gridColumn7.FieldName = "dab007";
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 4;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鍗曚綅";
+ this.gridColumn8.FieldName = "dwName";
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 5;
//
// gvMx1bld010
//
@@ -429,10 +484,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -448,7 +503,7 @@
this.gv_wcTime.OptionsColumn.AllowEdit = false;
this.gv_wcTime.Tag = "query_a.wc_time";
this.gv_wcTime.Visible = true;
- this.gv_wcTime.VisibleIndex = 22;
+ this.gv_wcTime.VisibleIndex = 17;
this.gv_wcTime.Width = 94;
//
// gv_wcUser
@@ -462,22 +517,8 @@
this.gv_wcUser.OptionsColumn.AllowEdit = false;
this.gv_wcUser.Tag = "query_a.wc_user";
this.gv_wcUser.Visible = true;
- this.gv_wcUser.VisibleIndex = 21;
+ this.gv_wcUser.VisibleIndex = 16;
this.gv_wcUser.Width = 94;
- //
- // gv_itemId
- //
- this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_itemId.AppearanceCell.Options.UseFont = true;
- this.gv_itemId.Caption = "浜у搧id ";
- this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 50;
- this.gv_itemId.Name = "gv_itemId";
- this.gv_itemId.OptionsColumn.AllowEdit = false;
- this.gv_itemId.Tag = "query_a.item_id";
- this.gv_itemId.Visible = true;
- this.gv_itemId.VisibleIndex = 20;
- this.gv_itemId.Width = 94;
//
// gv_bl019
//
@@ -532,7 +573,7 @@
this.gv_bl017.OptionsColumn.AllowEdit = false;
this.gv_bl017.Tag = "query_a.bl017";
this.gv_bl017.Visible = true;
- this.gv_bl017.VisibleIndex = 19;
+ this.gv_bl017.VisibleIndex = 15;
this.gv_bl017.Width = 94;
//
// lb_bl016
@@ -547,13 +588,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
//
@@ -566,7 +607,7 @@
this.gv_bl016.OptionsColumn.AllowEdit = false;
this.gv_bl016.Tag = "query_a.bl016";
this.gv_bl016.Visible = true;
- this.gv_bl016.VisibleIndex = 18;
+ this.gv_bl016.VisibleIndex = 11;
this.gv_bl016.Width = 94;
//
// lb_bl015
@@ -581,13 +622,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
//
@@ -600,7 +641,7 @@
this.gv_bl015.OptionsColumn.AllowEdit = false;
this.gv_bl015.Tag = "query_a.bl015";
this.gv_bl015.Visible = true;
- this.gv_bl015.VisibleIndex = 17;
+ this.gv_bl015.VisibleIndex = 7;
this.gv_bl015.Width = 94;
//
// lb_bl014
@@ -615,13 +656,14 @@
//
// 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.Properties.Tag = "readonly";
this.txt_bl014.Size = new System.Drawing.Size(160, 28);
this.txt_bl014.TabIndex = 258;
+ this.txt_bl014.Tag = "readonly";
//
// gv_bl014
//
@@ -634,7 +676,7 @@
this.gv_bl014.OptionsColumn.AllowEdit = false;
this.gv_bl014.Tag = "query_a.bl014";
this.gv_bl014.Visible = true;
- this.gv_bl014.VisibleIndex = 16;
+ this.gv_bl014.VisibleIndex = 5;
this.gv_bl014.Width = 94;
//
// lb_bl013
@@ -649,13 +691,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
//
@@ -668,36 +710,8 @@
this.gv_bl013.OptionsColumn.AllowEdit = false;
this.gv_bl013.Tag = "query_a.bl013";
this.gv_bl013.Visible = true;
- this.gv_bl013.VisibleIndex = 15;
+ this.gv_bl013.VisibleIndex = 14;
this.gv_bl013.Width = 94;
- //
- // gv_bl012
- //
- this.gv_bl012.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_bl012.AppearanceCell.Options.UseFont = true;
- this.gv_bl012.Caption = "琛ユ枡浜х嚎 ";
- this.gv_bl012.FieldName = "bl012";
- this.gv_bl012.MinWidth = 50;
- this.gv_bl012.Name = "gv_bl012";
- this.gv_bl012.OptionsColumn.AllowEdit = false;
- this.gv_bl012.Tag = "query_a.bl012";
- this.gv_bl012.Visible = true;
- this.gv_bl012.VisibleIndex = 14;
- this.gv_bl012.Width = 94;
- //
- // gv_bl011
- //
- this.gv_bl011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_bl011.AppearanceCell.Options.UseFont = true;
- this.gv_bl011.Caption = "琛ユ枡閮ㄩ棬 ";
- this.gv_bl011.FieldName = "bl011";
- this.gv_bl011.MinWidth = 50;
- this.gv_bl011.Name = "gv_bl011";
- this.gv_bl011.OptionsColumn.AllowEdit = false;
- this.gv_bl011.Tag = "query_a.bl011";
- this.gv_bl011.Visible = true;
- this.gv_bl011.VisibleIndex = 13;
- this.gv_bl011.Width = 94;
//
// lb_bl010
//
@@ -714,13 +728,13 @@
this.gv_bl010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_bl010.AppearanceCell.Options.UseFont = true;
this.gv_bl010.Caption = "鍙戞枡浠� ";
- this.gv_bl010.FieldName = "bl010";
+ this.gv_bl010.FieldName = "ckName";
this.gv_bl010.MinWidth = 50;
this.gv_bl010.Name = "gv_bl010";
this.gv_bl010.OptionsColumn.AllowEdit = false;
this.gv_bl010.Tag = "query_a.bl010";
this.gv_bl010.Visible = true;
- this.gv_bl010.VisibleIndex = 12;
+ this.gv_bl010.VisibleIndex = 13;
this.gv_bl010.Width = 94;
//
// gv_bl009
@@ -734,22 +748,8 @@
this.gv_bl009.OptionsColumn.AllowEdit = false;
this.gv_bl009.Tag = "query_a.bl009";
this.gv_bl009.Visible = true;
- this.gv_bl009.VisibleIndex = 11;
+ this.gv_bl009.VisibleIndex = 12;
this.gv_bl009.Width = 94;
- //
- // gv_bl008
- //
- this.gv_bl008.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_bl008.AppearanceCell.Options.UseFont = true;
- this.gv_bl008.Caption = "鍑哄簱绫诲埆锛堣ˉ鏂�,瓒呴锛� ";
- this.gv_bl008.FieldName = "bl008";
- this.gv_bl008.MinWidth = 50;
- this.gv_bl008.Name = "gv_bl008";
- this.gv_bl008.OptionsColumn.AllowEdit = false;
- this.gv_bl008.Tag = "query_a.bl008";
- this.gv_bl008.Visible = true;
- this.gv_bl008.VisibleIndex = 10;
- this.gv_bl008.Width = 94;
//
// lb_bl007
//
@@ -781,7 +781,7 @@
this.gv_bl007.OptionsColumn.AllowEdit = false;
this.gv_bl007.Tag = "query_a.bl007";
this.gv_bl007.Visible = true;
- this.gv_bl007.VisibleIndex = 9;
+ this.gv_bl007.VisibleIndex = 10;
this.gv_bl007.Width = 94;
//
// lb_bl006
@@ -796,13 +796,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
//
@@ -815,7 +815,7 @@
this.gv_bl006.OptionsColumn.AllowEdit = false;
this.gv_bl006.Tag = "query_a.bl006";
this.gv_bl006.Visible = true;
- this.gv_bl006.VisibleIndex = 8;
+ this.gv_bl006.VisibleIndex = 9;
this.gv_bl006.Width = 94;
//
// gv_bl005
@@ -829,7 +829,7 @@
this.gv_bl005.OptionsColumn.AllowEdit = false;
this.gv_bl005.Tag = "query_a.bl005";
this.gv_bl005.Visible = true;
- this.gv_bl005.VisibleIndex = 7;
+ this.gv_bl005.VisibleIndex = 8;
this.gv_bl005.Width = 94;
//
// gv_bl004
@@ -846,20 +846,6 @@
this.gv_bl004.VisibleIndex = 6;
this.gv_bl004.Width = 94;
//
- // gv_bl003
- //
- this.gv_bl003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_bl003.AppearanceCell.Options.UseFont = true;
- this.gv_bl003.Caption = "浜ч噺 ";
- this.gv_bl003.FieldName = "bl003";
- this.gv_bl003.MinWidth = 50;
- this.gv_bl003.Name = "gv_bl003";
- this.gv_bl003.OptionsColumn.AllowEdit = false;
- this.gv_bl003.Tag = "query_a.bl003";
- this.gv_bl003.Visible = true;
- this.gv_bl003.VisibleIndex = 5;
- this.gv_bl003.Width = 94;
- //
// lb_bl002
//
this.lb_bl002.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -872,13 +858,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
//
@@ -930,13 +916,13 @@
//
// txt_blNo
//
- this.txt_blNo.Enabled = false;
this.txt_blNo.Location = new System.Drawing.Point(112, 16);
this.txt_blNo.Name = "txt_blNo";
this.txt_blNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_blNo.Properties.Appearance.Options.UseFont = true;
this.txt_blNo.Size = new System.Drawing.Size(150, 28);
this.txt_blNo.TabIndex = 211;
+ this.txt_blNo.Tag = "readonly";
//
// gv_blNo
//
@@ -1005,22 +991,17 @@
this.gv_blNo,
this.gv_bl001,
this.gv_bl002,
- this.gv_bl003,
- this.gv_bl004,
- this.gv_bl005,
- this.gv_bl006,
- this.gv_bl007,
- this.gv_bl008,
- this.gv_bl009,
- this.gv_bl010,
- this.gv_bl011,
- this.gv_bl012,
- this.gv_bl013,
this.gv_bl014,
this.gv_bl015,
+ this.gv_bl004,
+ this.gv_bl005,
this.gv_bl016,
+ this.gv_bl006,
+ this.gv_bl007,
+ this.gv_bl009,
+ this.gv_bl010,
+ this.gv_bl013,
this.gv_bl017,
- this.gv_itemId,
this.gv_wcUser,
this.gv_wcTime});
this.gridView1.GridControl = this.gcMain;
@@ -1086,7 +1067,7 @@
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.labelControl1);
this.panel1.Controls.Add(this.txt_aboutGuid);
- this.panel1.Controls.Add(this.txt_bl017);
+ this.panel1.Controls.Add(this.txt_bl008);
this.panel1.Controls.Add(this.txt_bl018);
this.panel1.Controls.Add(this.txt_bl010);
this.panel1.Controls.Add(this.labelControl11);
@@ -1135,18 +1116,18 @@
this.txt_aboutGuid.Size = new System.Drawing.Size(150, 28);
this.txt_aboutGuid.TabIndex = 287;
//
- // txt_bl017
+ // txt_bl008
//
- this.txt_bl017.EditValue = "鐢熶骇瓒呴";
- this.txt_bl017.Location = new System.Drawing.Point(360, 88);
- this.txt_bl017.Name = "txt_bl017";
- this.txt_bl017.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ this.txt_bl008.EditValue = "鐢熶骇瓒呴";
+ this.txt_bl008.Location = new System.Drawing.Point(360, 88);
+ this.txt_bl008.Name = "txt_bl008";
+ this.txt_bl008.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_bl017.Properties.Items.AddRange(new object[] {
+ this.txt_bl008.Properties.Items.AddRange(new object[] {
"濮斿瓒呴"});
- this.txt_bl017.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_bl017.Size = new System.Drawing.Size(150, 24);
- this.txt_bl017.TabIndex = 286;
+ this.txt_bl008.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_bl008.Size = new System.Drawing.Size(150, 24);
+ this.txt_bl008.TabIndex = 286;
//
// txt_bl018
//
@@ -1196,66 +1177,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn1
- //
- this.gridColumn1.Caption = "gridColumn1";
- this.gridColumn1.FieldName = "dabGuid";
- this.gridColumn1.Name = "gridColumn1";
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "gridColumn2";
- this.gridColumn2.FieldName = "itemId";
- this.gridColumn2.Name = "gridColumn2";
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "鐗╂枡缂栧彿";
- this.gridColumn3.FieldName = "itemNo";
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 0;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "鐗╂枡鍚嶇О";
- this.gridColumn4.FieldName = "itemName";
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 1;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn5.FieldName = "itemModel";
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 2;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "闇�棰嗙敤閲�";
- this.gridColumn6.FieldName = "dab006";
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 3;
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "宸查鐢ㄩ噺";
- this.gridColumn7.FieldName = "dab007";
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 4;
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "鍗曚綅";
- this.gridColumn8.FieldName = "dwName";
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 5;
- //
// Frm_WwCl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1290,7 +1211,7 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_bl017.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_bl008.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl018.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -1326,7 +1247,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gv_wcTime;
private DevExpress.XtraGrid.Columns.GridColumn gv_wcUser;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
private DevExpress.XtraGrid.Columns.GridColumn gv_bl019;
private DevExpress.XtraEditors.LabelControl lb_bl018;
@@ -1348,13 +1268,10 @@
private DevExpress.XtraEditors.LabelControl lb_bl013;
private DevExpress.XtraEditors.TextEdit txt_bl013;
private DevExpress.XtraGrid.Columns.GridColumn gv_bl013;
- private DevExpress.XtraGrid.Columns.GridColumn gv_bl012;
- private DevExpress.XtraGrid.Columns.GridColumn gv_bl011;
private DevExpress.XtraEditors.LabelControl lb_bl010;
private DevExpress.XtraGrid.Columns.GridColumn gv_bl010;
private DevExpress.XtraGrid.Columns.GridColumn gv_bl009;
- private DevExpress.XtraGrid.Columns.GridColumn gv_bl008;
private DevExpress.XtraEditors.LabelControl lb_bl007;
private DevExpress.XtraEditors.TextEdit txt_bl007;
@@ -1365,7 +1282,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_bl006;
private DevExpress.XtraGrid.Columns.GridColumn gv_bl005;
private DevExpress.XtraGrid.Columns.GridColumn gv_bl004;
- private DevExpress.XtraGrid.Columns.GridColumn gv_bl003;
private DevExpress.XtraEditors.LabelControl lb_bl002;
private DevExpress.XtraEditors.TextEdit txt_bl002;
@@ -1386,7 +1302,7 @@
private DevExpress.XtraGrid.Columns.GridColumn dabGuid;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraEditors.ComboBoxEdit txt_bl017;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_bl008;
private UserControl.UcLookWwgd txt_aboutGuid;
private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs
index 356c875..988dc21 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwCl.cs
@@ -56,7 +56,7 @@
txt_bl002.Text = txt_aboutGuid.GetPrdNo();
txt_bl014.Text = txt_aboutGuid.GetPrdName();
txt_bl015.Text = txt_aboutGuid.GetPrdModel();
-
+ txt_bl013.Text = txt_aboutGuid.GetRwd();
var _obj = new
{
currentPage = 1,
@@ -257,10 +257,10 @@
txt_bl010.Focus();
return;
}
- if (string.IsNullOrEmpty(txt_bl017.Text.Trim()))
+ if (string.IsNullOrEmpty(txt_bl008.Text.Trim()))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
- txt_bl017.Focus();
+ txt_bl008.Focus();
return;
}
var _obj = new
@@ -269,7 +269,7 @@
inGdId = inGdId,//宸ュ崟鍙�
inCkId = inCkId,//浠撳簱
inYy = txt_bl007.Text.Trim(),//鍘熷洜
- inType = txt_bl017.Text.Trim(),//绫诲瀷
+ inType = txt_bl008.Text.Trim(),//绫诲瀷
busType = 801,//涓氬姟绫诲瀷缂栫爜
busTypeTxt = "濮斿瓒呴",//涓氬姟绫诲瀷
list = new List<dynamic>(),
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index b33f18b..96ea59a 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -276,12 +276,11 @@
{
colmn.OptionsColumn.AllowEdit = true;
- if (colmn.Name.ToString().Contains("gvBtnAlawys") )
+ if (colmn.Name.ToString().Contains("gvBtnAlawys"))
{
colmn.Visible = true;
colmn.OptionsColumn.ReadOnly = false;
};
-
if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
{
colmn.Visible = !isEdt;
@@ -331,7 +330,6 @@
txt.ReadOnly = isEdt;
continue;
}
-
if (colType is ImageComboBoxEdit)
{
var txt = colType as ImageComboBoxEdit;
@@ -346,7 +344,6 @@
}
continue;
}
-
if (colType is ComboBoxEdit)
{
var txt = colType as ComboBoxEdit;
@@ -367,8 +364,6 @@
txt.ReadOnly = isEdt;
continue;
}
-
-
//鑷畾涔変笅鎷�
if (colType is UcComBox)
{
@@ -377,14 +372,18 @@
txt.Enabled = !isEdt;
continue;
}
-
//鏂囨湰
if (colType is TextEdit)
{
var txt = colType as TextEdit;
if (txt != null)
txt.Text = strVal;
- txt.ReadOnly = isEdt;
+ if (_isRead(txt.Tag))
+ {
+ txt.ReadOnly = true;
+ }
+ else
+ txt.ReadOnly = isEdt;
continue;
}
if (colType is MemoEdit)
@@ -395,7 +394,6 @@
txt.ReadOnly = isEdt;
continue;
}
-
//鏁板瓧鍗�
if (colType is NumericUpDown)
{
@@ -405,7 +403,6 @@
txt.ReadOnly = isEdt;
continue;
}
-
//鍗曢��
if (colType is CheckEdit)
{
@@ -430,7 +427,6 @@
txt.ReadOnly = isEdt;
continue;
}
-
//鍗曢��
if (colType is CheckBox)
{
@@ -456,7 +452,6 @@
txt.Enabled = !isEdt;
continue;
}
-
//Label
if (colType is Label)
{
@@ -539,7 +534,6 @@
txt.Enabled = false;
continue;
}
-
//鑷畾瀹㈡埛
if (colType is UcLookCustomer)
{
@@ -700,7 +694,6 @@
txt.ReadOnly = isEdt;
continue;
}
-
//涓嬫媺
if (ctrl is ComboBoxEdit)
{
@@ -713,7 +706,6 @@
txt.ReadOnly = isEdt;
continue;
}
-
//鑷畾涔夌殑涓嬫媺
if (ctrl is UcComBox)
{
@@ -722,7 +714,6 @@
txt.Enabled = !isEdt;
continue;
}
-
//鏂囨湰
if (ctrl is TextEdit)
{
@@ -733,7 +724,12 @@
}
else
txt.Text = "";
- txt.ReadOnly = isEdt;
+ if (_isRead(txt.Tag))
+ {
+ txt.ReadOnly = true;
+ }
+ else
+ txt.ReadOnly = isEdt;
continue;
}
if (ctrl is MemoEdit)
@@ -892,10 +888,9 @@
txt.Enabled = !isEdt;
continue;
}
-
}
}
-
+
/// <summary>
/// 绂佺敤鎴栧惎鐢ㄥ鍣ㄩ噷闈㈢殑鎺т欢
/// </summary>
@@ -933,7 +928,12 @@
if (ctrl is TextEdit)
{
var txt = ctrl as TextEdit;
- txt.ReadOnly = isEdt;
+ if (_isRead(txt.Tag))
+ {
+ txt.ReadOnly = true;
+ }
+ else
+ txt.ReadOnly = isEdt;
continue;
}
if (ctrl is MemoEdit)
@@ -1137,6 +1137,14 @@
}
}
+ private static bool _isRead(object obj)
+ {
+ if (obj != null && obj.ToString().ToUpper().Contains("readOnly".ToUpper()))
+ {
+ return true;
+ }
+ return false;
+ }
/// <summary>
/// 鍒囨崲閫夐」鍗�
/// </summary>
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs b/DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs
index 09a8106..cdaf3a1 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs
@@ -164,5 +164,21 @@
}
return "";
}
+
+ /// <summary>
+ /// 浠诲姟鍗�
+ /// </summary>
+ /// <returns></returns>
+ public string GetRwd()
+ {
+ var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+ if (row != null)
+ {
+ string id = row["daa014"].ToString();
+ return id;
+ }
+ return "";
+ }
+
}
}
--
Gitblit v1.9.3