From c0575b3330ef57fffd9e617eb25ea38f821c0aa7 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 31 十月 2024 10:19:43 +0800
Subject: [PATCH] 检验项目增加了审核
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs | 66 +++++++++++-----------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 6 +
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs | 66 +++++++++++-----------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | 6 +
4 files changed, 74 insertions(+), 70 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
index c21a53c..7e4d565 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
@@ -51,6 +51,9 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -59,9 +62,6 @@
this.panel1 = new System.Windows.Forms.Panel();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -279,6 +279,36 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "瀹℃牳鐘舵��";
+ this.gridColumn5.FieldName = "checkStatus";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 2;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "瀹℃牳浜�";
+ this.gridColumn4.FieldName = "checkBy";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 3;
+ this.gridColumn4.Width = 94;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "瀹℃牳鏃堕棿";
+ this.gridColumn1.FieldName = "checkDate";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.Width = 94;
+ //
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -364,36 +394,6 @@
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "瀹℃牳鏃堕棿";
- this.gridColumn1.FieldName = "checkDate";
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
- this.gridColumn1.Width = 94;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "瀹℃牳浜�";
- this.gridColumn4.FieldName = "checkBy";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 3;
- this.gridColumn4.Width = 94;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "瀹℃牳鐘舵��";
- this.gridColumn5.FieldName = "checkSatus";
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 2;
- this.gridColumn5.Width = 94;
//
// Frm_IQCLookups
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 35db28d..70105df 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -252,8 +252,10 @@
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(panel1.Controls,
- false);
+ var gridViews = new List<GridView>();
+ gridViews.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, false,
+ gridViews);
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
index 7022604..47dae72 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
@@ -51,6 +51,9 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -59,9 +62,6 @@
this.panel1 = new System.Windows.Forms.Panel();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -279,6 +279,36 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "瀹℃牳鐘舵��";
+ this.gridColumn5.FieldName = "checkStatus";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 2;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "瀹℃牳浜�";
+ this.gridColumn4.FieldName = "checkBy";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 3;
+ this.gridColumn4.Width = 94;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "瀹℃牳鏃堕棿";
+ this.gridColumn1.FieldName = "checkDate";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.Width = 94;
+ //
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -364,36 +394,6 @@
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "瀹℃牳鏃堕棿";
- this.gridColumn1.FieldName = "checkDate";
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
- this.gridColumn1.Width = 94;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "瀹℃牳浜�";
- this.gridColumn4.FieldName = "checkBy";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 3;
- this.gridColumn4.Width = 94;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "瀹℃牳鐘舵��";
- this.gridColumn5.FieldName = "checkSatus";
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 2;
- this.gridColumn5.Width = 94;
//
// Frm_MesSysLookups
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
index 4ae8386..ef92128 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -136,7 +136,6 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
getModel(rowGuid, true, 1);
}
@@ -188,7 +187,10 @@
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- getModel(lbGuid.Text, false, 1);
+ var gridViews = new List<GridView>();
+ gridViews.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, false,
+ gridViews);
}
}
catch (Exception ex)
--
Gitblit v1.9.3