From 125a3ef5be646daa13d4fdadac8e77a8da3f66d3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 25 十月 2024 18:55:26 +0800
Subject: [PATCH] 优化页面的展示
---
DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs | 11
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 135 ++++++++----
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 415 ++++++++++++++++++++++------------------
3 files changed, 321 insertions(+), 240 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index 2ba63a8..1c91790 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -45,8 +45,9 @@
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.lb_itemId = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_tname = new DevExpress.XtraEditors.LabelControl();
this.txt_tname = new DevExpress.XtraEditors.TextEdit();
this.lb_isenabled = new DevExpress.XtraEditors.LabelControl();
@@ -72,8 +73,6 @@
this.lb_foneChecked = new DevExpress.XtraEditors.LabelControl();
this.txt_foneChecked = new DevExpress.XtraEditors.TextEdit();
this.gv_foneChecked = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_finspectionLevel = new DevExpress.XtraEditors.LabelControl();
- this.txt_finspectionLevel = new DevExpress.XtraEditors.TextEdit();
this.gv_name1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_itemNo = new DevExpress.XtraEditors.LabelControl();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
@@ -81,27 +80,30 @@
this.lb_memo = new DevExpress.XtraEditors.LabelControl();
this.txt_memo = new DevExpress.XtraEditors.TextEdit();
this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_guid = new DevExpress.XtraEditors.LabelControl();
- this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = 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();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.lb_itemModel = new DevExpress.XtraEditors.LabelControl();
+ this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
+ this.labelCreateDate = new DevExpress.XtraEditors.LabelControl();
+ this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
+ this.labelUserName = new DevExpress.XtraEditors.LabelControl();
+ this.txt_userName = new DevExpress.XtraEditors.TextEdit();
this.lbGuid = new System.Windows.Forms.Label();
- 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.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tname.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).BeginInit();
@@ -111,10 +113,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_finspectionLevel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -124,6 +124,9 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).BeginInit();
this.SuspendLayout();
//
// gvMx1pid
@@ -147,7 +150,7 @@
this.gvMx1facLevel.Name = "gvMx1facLevel";
this.gvMx1facLevel.Tag = "query_a.FAC_LEVEL";
this.gvMx1facLevel.Visible = true;
- this.gvMx1facLevel.VisibleIndex = 10;
+ this.gvMx1facLevel.VisibleIndex = 9;
this.gvMx1facLevel.Width = 94;
//
// gvMx1fstand
@@ -160,7 +163,7 @@
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "query_a.FSTAND";
this.gvMx1fstand.Visible = true;
- this.gvMx1fstand.VisibleIndex = 6;
+ this.gvMx1fstand.VisibleIndex = 11;
this.gvMx1fstand.Width = 94;
//
// gvMx1fcheckLevel
@@ -173,20 +176,20 @@
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "query_a.FCHECK_LEVEL";
this.gvMx1fcheckLevel.Visible = true;
- this.gvMx1fcheckLevel.VisibleIndex = 4;
+ this.gvMx1fcheckLevel.VisibleIndex = 8;
this.gvMx1fcheckLevel.Width = 94;
//
// gvMx1fdownAllow
//
this.gvMx1fdownAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
- this.gvMx1fdownAllow.Caption = "涓嬪叕宸� ";
+ this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
this.gvMx1fdownAllow.MinWidth = 50;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "query_a.FDOWN_ALLOW";
this.gvMx1fdownAllow.Visible = true;
- this.gvMx1fdownAllow.VisibleIndex = 7;
+ this.gvMx1fdownAllow.VisibleIndex = 12;
this.gvMx1fdownAllow.Width = 94;
//
// gvMx1fcheckTool
@@ -199,20 +202,20 @@
this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
this.gvMx1fcheckTool.Tag = "query_a.FCHECK_TOOL";
this.gvMx1fcheckTool.Visible = true;
- this.gvMx1fcheckTool.VisibleIndex = 2;
+ this.gvMx1fcheckTool.VisibleIndex = 4;
this.gvMx1fcheckTool.Width = 94;
//
// gvMx1sampleSizeNo
//
this.gvMx1sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1sampleSizeNo.Caption = "妫�楠屾按鍑嗙紪鐮� ";
+ this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗙紪鐮� ";
this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
this.gvMx1sampleSizeNo.MinWidth = 50;
this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
this.gvMx1sampleSizeNo.Tag = "query_a.SAMPLE_SIZE_NO";
this.gvMx1sampleSizeNo.Visible = true;
- this.gvMx1sampleSizeNo.VisibleIndex = 9;
+ this.gvMx1sampleSizeNo.VisibleIndex = 5;
this.gvMx1sampleSizeNo.Width = 94;
//
// gvMx1fcheckItem
@@ -232,13 +235,13 @@
//
this.gvMx1fupAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
- this.gvMx1fupAllow.Caption = "涓婂叕宸� ";
+ this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
this.gvMx1fupAllow.MinWidth = 50;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
this.gvMx1fupAllow.Tag = "query_a.FUP_ALLOW";
this.gvMx1fupAllow.Visible = true;
- this.gvMx1fupAllow.VisibleIndex = 5;
+ this.gvMx1fupAllow.VisibleIndex = 10;
this.gvMx1fupAllow.Width = 94;
//
// gvMx1forder
@@ -258,26 +261,26 @@
//
this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1itemNo.Caption = "鐗╂枡浜у搧缂栫爜 ";
+ this.gvMx1itemNo.Caption = "鐗╂枡缂栫爜 ";
this.gvMx1itemNo.FieldName = "itemNo";
this.gvMx1itemNo.MinWidth = 50;
this.gvMx1itemNo.Name = "gvMx1itemNo";
this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
this.gvMx1itemNo.Visible = true;
- this.gvMx1itemNo.VisibleIndex = 3;
+ this.gvMx1itemNo.VisibleIndex = 7;
this.gvMx1itemNo.Width = 94;
//
// gvMx1memo
//
this.gvMx1memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1memo.AppearanceCell.Options.UseFont = true;
- this.gvMx1memo.Caption = "澶囨敞 ";
+ this.gvMx1memo.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1memo.FieldName = "memo";
this.gvMx1memo.MinWidth = 50;
this.gvMx1memo.Name = "gvMx1memo";
this.gvMx1memo.Tag = "query_a.MEMO";
this.gvMx1memo.Visible = true;
- this.gvMx1memo.VisibleIndex = 8;
+ this.gvMx1memo.VisibleIndex = 3;
this.gvMx1memo.Width = 94;
//
// gvMx1guid
@@ -295,7 +298,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 361);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 349);
this.tabMxPage1.Text = "鏄庣粏1";
//
// gcMx1
@@ -304,7 +307,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 361);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 349);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -313,18 +316,21 @@
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
- this.gvMx1memo,
- this.gvMx1itemNo,
+ this.gvMx1pid,
this.gvMx1forder,
- this.gvMx1fupAllow,
this.gvMx1fcheckItem,
- this.gvMx1sampleSizeNo,
+ this.gridColumn5,
+ this.gvMx1memo,
this.gvMx1fcheckTool,
- this.gvMx1fdownAllow,
+ this.gvMx1sampleSizeNo,
+ this.gridColumn6,
+ this.gvMx1itemNo,
this.gvMx1fcheckLevel,
- this.gvMx1fstand,
this.gvMx1facLevel,
- this.gvMx1pid});
+ this.gvMx1fupAllow,
+ this.gvMx1fstand,
+ this.gvMx1fdownAllow,
+ this.gridColumn7});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -332,30 +338,41 @@
this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
- // lb_itemId
+ // gridColumn5
//
- this.lb_itemId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_itemId.Appearance.Options.UseFont = true;
- this.lb_itemId.Location = new System.Drawing.Point(261, 20);
- this.lb_itemId.Name = "lb_itemId";
- this.lb_itemId.Size = new System.Drawing.Size(57, 21);
- this.lb_itemId.TabIndex = 378;
- this.lb_itemId.Text = "鐗╂枡ID ";
+ this.gridColumn5.Caption = "瑙勬牸瑕佹眰";
+ this.gridColumn5.FieldName = "fspecRequ";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 2;
+ this.gridColumn5.Width = 94;
//
- // txt_itemId
+ // gridColumn6
//
- this.txt_itemId.Location = new System.Drawing.Point(331, 17);
- this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemId.Properties.Appearance.Options.UseFont = true;
- this.txt_itemId.Size = new System.Drawing.Size(150, 28);
- this.txt_itemId.TabIndex = 378;
+ this.gridColumn6.Caption = "妫�楠屾爣鍑嗗悕绉�";
+ this.gridColumn6.FieldName = "sampleSizeName";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 6;
+ this.gridColumn6.Width = 94;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "澶囨敞";
+ this.gridColumn7.FieldName = "funit";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 13;
+ this.gridColumn7.Width = 94;
//
// lb_tname
//
this.lb_tname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_tname.Appearance.Options.UseFont = true;
- this.lb_tname.Location = new System.Drawing.Point(788, 63);
+ this.lb_tname.Location = new System.Drawing.Point(4, 59);
this.lb_tname.Name = "lb_tname";
this.lb_tname.Size = new System.Drawing.Size(73, 21);
this.lb_tname.TabIndex = 370;
@@ -363,18 +380,18 @@
//
// txt_tname
//
- this.txt_tname.Location = new System.Drawing.Point(867, 56);
+ this.txt_tname.Location = new System.Drawing.Point(79, 56);
this.txt_tname.Name = "txt_tname";
this.txt_tname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_tname.Properties.Appearance.Options.UseFont = true;
- this.txt_tname.Size = new System.Drawing.Size(150, 28);
+ this.txt_tname.Size = new System.Drawing.Size(142, 28);
this.txt_tname.TabIndex = 370;
//
// lb_isenabled
//
this.lb_isenabled.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isenabled.Appearance.Options.UseFont = true;
- this.lb_isenabled.Location = new System.Drawing.Point(500, 55);
+ this.lb_isenabled.Location = new System.Drawing.Point(237, 59);
this.lb_isenabled.Name = "lb_isenabled";
this.lb_isenabled.Size = new System.Drawing.Size(73, 21);
this.lb_isenabled.TabIndex = 306;
@@ -382,11 +399,11 @@
//
// txt_isenabled
//
- this.txt_isenabled.Location = new System.Drawing.Point(613, 52);
+ this.txt_isenabled.Location = new System.Drawing.Point(316, 56);
this.txt_isenabled.Name = "txt_isenabled";
this.txt_isenabled.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_isenabled.Properties.Appearance.Options.UseFont = true;
- this.txt_isenabled.Size = new System.Drawing.Size(150, 28);
+ this.txt_isenabled.Size = new System.Drawing.Size(61, 28);
this.txt_isenabled.TabIndex = 306;
//
// gv_isenabled
@@ -394,7 +411,7 @@
this.gv_isenabled.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_isenabled.AppearanceCell.Options.UseFont = true;
this.gv_isenabled.Caption = "鏄惁鍙敤 ";
- this.gv_isenabled.FieldName = "isenabled";
+ this.gv_isenabled.FieldName = "isEnabled";
this.gv_isenabled.MinWidth = 50;
this.gv_isenabled.Name = "gv_isenabled";
this.gv_isenabled.OptionsColumn.AllowEdit = false;
@@ -407,7 +424,7 @@
//
this.lb_fversion.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fversion.Appearance.Options.UseFont = true;
- this.lb_fversion.Location = new System.Drawing.Point(804, 20);
+ this.lb_fversion.Location = new System.Drawing.Point(907, 20);
this.lb_fversion.Name = "lb_fversion";
this.lb_fversion.Size = new System.Drawing.Size(39, 21);
this.lb_fversion.TabIndex = 298;
@@ -415,11 +432,11 @@
//
// txt_fversion
//
- this.txt_fversion.Location = new System.Drawing.Point(867, 13);
+ this.txt_fversion.Location = new System.Drawing.Point(981, 14);
this.txt_fversion.Name = "txt_fversion";
this.txt_fversion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fversion.Properties.Appearance.Options.UseFont = true;
- this.txt_fversion.Size = new System.Drawing.Size(150, 28);
+ this.txt_fversion.Size = new System.Drawing.Size(80, 28);
this.txt_fversion.TabIndex = 298;
//
// gv_fversion
@@ -427,7 +444,7 @@
this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fversion.AppearanceCell.Options.UseFont = true;
this.gv_fversion.Caption = "鐗堟湰 ";
- this.gv_fversion.FieldName = "fversion";
+ this.gv_fversion.FieldName = "fVersion";
this.gv_fversion.MinWidth = 50;
this.gv_fversion.Name = "gv_fversion";
this.gv_fversion.OptionsColumn.AllowEdit = false;
@@ -440,7 +457,7 @@
//
this.lb_ftwoCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoCheckdate.Appearance.Options.UseFont = true;
- this.lb_ftwoCheckdate.Location = new System.Drawing.Point(4, 130);
+ this.lb_ftwoCheckdate.Location = new System.Drawing.Point(632, 94);
this.lb_ftwoCheckdate.Name = "lb_ftwoCheckdate";
this.lb_ftwoCheckdate.Size = new System.Drawing.Size(73, 21);
this.lb_ftwoCheckdate.TabIndex = 285;
@@ -448,18 +465,18 @@
//
// txt_ftwoCheckdate
//
- this.txt_ftwoCheckdate.Location = new System.Drawing.Point(80, 127);
+ this.txt_ftwoCheckdate.Location = new System.Drawing.Point(707, 91);
this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
this.txt_ftwoCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoCheckdate.Size = new System.Drawing.Size(150, 28);
+ this.txt_ftwoCheckdate.Size = new System.Drawing.Size(178, 28);
this.txt_ftwoCheckdate.TabIndex = 285;
//
// lb_ftwoCheckor
//
this.lb_ftwoCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoCheckor.Appearance.Options.UseFont = true;
- this.lb_ftwoCheckor.Location = new System.Drawing.Point(517, 130);
+ this.lb_ftwoCheckor.Location = new System.Drawing.Point(398, 94);
this.lb_ftwoCheckor.Name = "lb_ftwoCheckor";
this.lb_ftwoCheckor.Size = new System.Drawing.Size(56, 21);
this.lb_ftwoCheckor.TabIndex = 280;
@@ -467,7 +484,7 @@
//
// txt_ftwoCheckor
//
- this.txt_ftwoCheckor.Location = new System.Drawing.Point(613, 123);
+ this.txt_ftwoCheckor.Location = new System.Drawing.Point(460, 91);
this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
this.txt_ftwoCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
@@ -479,7 +496,7 @@
this.gv_ftwoCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_ftwoCheckor.AppearanceCell.Options.UseFont = true;
this.gv_ftwoCheckor.Caption = "鎵瑰噯浜� ";
- this.gv_ftwoCheckor.FieldName = "ftwoCheckor";
+ this.gv_ftwoCheckor.FieldName = "fTwoCheckor";
this.gv_ftwoCheckor.MinWidth = 50;
this.gv_ftwoCheckor.Name = "gv_ftwoCheckor";
this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false;
@@ -492,7 +509,7 @@
//
this.lb_ftwoChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoChecked.Appearance.Options.UseFont = true;
- this.lb_ftwoChecked.Location = new System.Drawing.Point(251, 130);
+ this.lb_ftwoChecked.Location = new System.Drawing.Point(892, 94);
this.lb_ftwoChecked.Name = "lb_ftwoChecked";
this.lb_ftwoChecked.Size = new System.Drawing.Size(73, 21);
this.lb_ftwoChecked.TabIndex = 273;
@@ -500,11 +517,11 @@
//
// txt_ftwoChecked
//
- this.txt_ftwoChecked.Location = new System.Drawing.Point(331, 127);
+ this.txt_ftwoChecked.Location = new System.Drawing.Point(981, 91);
this.txt_ftwoChecked.Name = "txt_ftwoChecked";
this.txt_ftwoChecked.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_ftwoChecked.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoChecked.Size = new System.Drawing.Size(150, 28);
+ this.txt_ftwoChecked.Size = new System.Drawing.Size(80, 28);
this.txt_ftwoChecked.TabIndex = 273;
//
// gv_ftwoChecked
@@ -512,7 +529,7 @@
this.gv_ftwoChecked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_ftwoChecked.AppearanceCell.Options.UseFont = true;
this.gv_ftwoChecked.Caption = "鎵瑰噯鏍囪 ";
- this.gv_ftwoChecked.FieldName = "ftwoChecked";
+ this.gv_ftwoChecked.FieldName = "fTwoChecked";
this.gv_ftwoChecked.MinWidth = 50;
this.gv_ftwoChecked.Name = "gv_ftwoChecked";
this.gv_ftwoChecked.OptionsColumn.AllowEdit = false;
@@ -525,7 +542,7 @@
//
this.lb_foneCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneCheckdate.Appearance.Options.UseFont = true;
- this.lb_foneCheckdate.Location = new System.Drawing.Point(251, 95);
+ this.lb_foneCheckdate.Location = new System.Drawing.Point(633, 63);
this.lb_foneCheckdate.Name = "lb_foneCheckdate";
this.lb_foneCheckdate.Size = new System.Drawing.Size(73, 21);
this.lb_foneCheckdate.TabIndex = 267;
@@ -533,11 +550,11 @@
//
// txt_foneCheckdate
//
- this.txt_foneCheckdate.Location = new System.Drawing.Point(330, 95);
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(707, 57);
this.txt_foneCheckdate.Name = "txt_foneCheckdate";
this.txt_foneCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckdate.Size = new System.Drawing.Size(150, 28);
+ this.txt_foneCheckdate.Size = new System.Drawing.Size(178, 28);
this.txt_foneCheckdate.TabIndex = 267;
//
// gv_foneCheckdate
@@ -545,7 +562,7 @@
this.gv_foneCheckdate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true;
this.gv_foneCheckdate.Caption = "瀹℃壒鏃ユ湡 ";
- this.gv_foneCheckdate.FieldName = "foneCheckdate";
+ this.gv_foneCheckdate.FieldName = "fOneCheckDate";
this.gv_foneCheckdate.MinWidth = 50;
this.gv_foneCheckdate.Name = "gv_foneCheckdate";
this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
@@ -558,7 +575,7 @@
//
this.lb_foneCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneCheckor.Appearance.Options.UseFont = true;
- this.lb_foneCheckor.Location = new System.Drawing.Point(11, 95);
+ this.lb_foneCheckor.Location = new System.Drawing.Point(400, 59);
this.lb_foneCheckor.Name = "lb_foneCheckor";
this.lb_foneCheckor.Size = new System.Drawing.Size(56, 21);
this.lb_foneCheckor.TabIndex = 262;
@@ -566,7 +583,7 @@
//
// txt_foneCheckor
//
- this.txt_foneCheckor.Location = new System.Drawing.Point(80, 95);
+ this.txt_foneCheckor.Location = new System.Drawing.Point(460, 56);
this.txt_foneCheckor.Name = "txt_foneCheckor";
this.txt_foneCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
@@ -578,7 +595,7 @@
this.gv_foneCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_foneCheckor.AppearanceCell.Options.UseFont = true;
this.gv_foneCheckor.Caption = "瀹℃壒浜� ";
- this.gv_foneCheckor.FieldName = "foneCheckor";
+ this.gv_foneCheckor.FieldName = "fOneCheckor";
this.gv_foneCheckor.MinWidth = 50;
this.gv_foneCheckor.Name = "gv_foneCheckor";
this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
@@ -591,7 +608,7 @@
//
this.lb_foneChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_foneChecked.Appearance.Options.UseFont = true;
- this.lb_foneChecked.Location = new System.Drawing.Point(500, 91);
+ this.lb_foneChecked.Location = new System.Drawing.Point(893, 59);
this.lb_foneChecked.Name = "lb_foneChecked";
this.lb_foneChecked.Size = new System.Drawing.Size(73, 21);
this.lb_foneChecked.TabIndex = 258;
@@ -599,11 +616,11 @@
//
// txt_foneChecked
//
- this.txt_foneChecked.Location = new System.Drawing.Point(613, 88);
+ this.txt_foneChecked.Location = new System.Drawing.Point(981, 56);
this.txt_foneChecked.Name = "txt_foneChecked";
this.txt_foneChecked.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_foneChecked.Properties.Appearance.Options.UseFont = true;
- this.txt_foneChecked.Size = new System.Drawing.Size(150, 28);
+ this.txt_foneChecked.Size = new System.Drawing.Size(80, 28);
this.txt_foneChecked.TabIndex = 258;
//
// gv_foneChecked
@@ -611,7 +628,7 @@
this.gv_foneChecked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_foneChecked.AppearanceCell.Options.UseFont = true;
this.gv_foneChecked.Caption = "瀹℃壒鏍囪 ";
- this.gv_foneChecked.FieldName = "foneChecked";
+ this.gv_foneChecked.FieldName = "fOneChecked";
this.gv_foneChecked.MinWidth = 50;
this.gv_foneChecked.Name = "gv_foneChecked";
this.gv_foneChecked.OptionsColumn.AllowEdit = false;
@@ -619,25 +636,6 @@
this.gv_foneChecked.Visible = true;
this.gv_foneChecked.VisibleIndex = 1;
this.gv_foneChecked.Width = 94;
- //
- // lb_finspectionLevel
- //
- this.lb_finspectionLevel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_finspectionLevel.Appearance.Options.UseFont = true;
- this.lb_finspectionLevel.Location = new System.Drawing.Point(3, 63);
- this.lb_finspectionLevel.Name = "lb_finspectionLevel";
- this.lb_finspectionLevel.Size = new System.Drawing.Size(73, 21);
- this.lb_finspectionLevel.TabIndex = 243;
- this.lb_finspectionLevel.Text = "妫�楠屾按鍑� ";
- //
- // txt_finspectionLevel
- //
- this.txt_finspectionLevel.Location = new System.Drawing.Point(82, 56);
- this.txt_finspectionLevel.Name = "txt_finspectionLevel";
- this.txt_finspectionLevel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_finspectionLevel.Properties.Appearance.Options.UseFont = true;
- this.txt_finspectionLevel.Size = new System.Drawing.Size(150, 28);
- this.txt_finspectionLevel.TabIndex = 243;
//
// gv_name1
//
@@ -657,19 +655,19 @@
//
this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemNo.Appearance.Options.UseFont = true;
- this.lb_itemNo.Location = new System.Drawing.Point(500, 20);
+ this.lb_itemNo.Location = new System.Drawing.Point(3, 20);
this.lb_itemNo.Name = "lb_itemNo";
- this.lb_itemNo.Size = new System.Drawing.Size(107, 21);
+ this.lb_itemNo.Size = new System.Drawing.Size(73, 21);
this.lb_itemNo.TabIndex = 222;
- this.lb_itemNo.Text = "鐗╂枡浜у搧缂栫爜 ";
+ this.lb_itemNo.Text = "鐗╂枡缂栫爜 ";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(613, 17);
+ this.txt_itemNo.Location = new System.Drawing.Point(79, 17);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(229, 28);
this.txt_itemNo.TabIndex = 222;
//
// gv_itemNo
@@ -690,7 +688,7 @@
//
this.lb_memo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_memo.Appearance.Options.UseFont = true;
- this.lb_memo.Location = new System.Drawing.Point(270, 52);
+ this.lb_memo.Location = new System.Drawing.Point(10, 94);
this.lb_memo.Name = "lb_memo";
this.lb_memo.Size = new System.Drawing.Size(39, 21);
this.lb_memo.TabIndex = 219;
@@ -698,11 +696,11 @@
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(330, 56);
+ this.txt_memo.Location = new System.Drawing.Point(79, 91);
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_memo.Properties.Appearance.Options.UseFont = true;
- this.txt_memo.Size = new System.Drawing.Size(150, 28);
+ this.txt_memo.Size = new System.Drawing.Size(229, 28);
this.txt_memo.TabIndex = 219;
//
// gv_memo
@@ -718,25 +716,6 @@
this.gv_memo.Visible = true;
this.gv_memo.VisibleIndex = 12;
this.gv_memo.Width = 94;
- //
- // lb_guid
- //
- this.lb_guid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_guid.Appearance.Options.UseFont = true;
- this.lb_guid.Location = new System.Drawing.Point(20, 20);
- this.lb_guid.Name = "lb_guid";
- this.lb_guid.Size = new System.Drawing.Size(36, 21);
- this.lb_guid.TabIndex = 210;
- this.lb_guid.Text = "guid ";
- //
- // txt_guid
- //
- this.txt_guid.Location = new System.Drawing.Point(80, 20);
- this.txt_guid.Name = "txt_guid";
- this.txt_guid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_guid.Properties.Appearance.Options.UseFont = true;
- this.txt_guid.Size = new System.Drawing.Size(150, 28);
- this.txt_guid.TabIndex = 210;
//
// gv_guid
//
@@ -803,6 +782,46 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn3.FieldName = "itemName";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 4;
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn2.FieldName = "itemModel";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 5;
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鍒朵綔鏃堕棿";
+ this.gridColumn4.FieldName = "createDate";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 6;
+ this.gridColumn4.Width = 94;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鍒朵綔浜�";
+ this.gridColumn1.FieldName = "userName";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 7;
+ this.gridColumn1.Width = 94;
+ //
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -848,10 +867,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 177);
+ this.tabMx.Location = new System.Drawing.Point(0, 189);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 393);
+ this.tabMx.Size = new System.Drawing.Size(1126, 381);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -859,9 +878,13 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.lb_itemModel);
+ this.panel1.Controls.Add(this.txt_itemModel);
+ this.panel1.Controls.Add(this.labelCreateDate);
+ this.panel1.Controls.Add(this.txt_createDate);
+ this.panel1.Controls.Add(this.labelUserName);
+ this.panel1.Controls.Add(this.txt_userName);
this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_itemId);
- this.panel1.Controls.Add(this.txt_itemId);
this.panel1.Controls.Add(this.lb_tname);
this.panel1.Controls.Add(this.txt_tname);
this.panel1.Controls.Add(this.lb_isenabled);
@@ -880,20 +903,73 @@
this.panel1.Controls.Add(this.txt_foneCheckor);
this.panel1.Controls.Add(this.lb_foneChecked);
this.panel1.Controls.Add(this.txt_foneChecked);
- this.panel1.Controls.Add(this.lb_finspectionLevel);
- this.panel1.Controls.Add(this.txt_finspectionLevel);
this.panel1.Controls.Add(this.lb_itemNo);
this.panel1.Controls.Add(this.txt_itemNo);
this.panel1.Controls.Add(this.lb_memo);
this.panel1.Controls.Add(this.txt_memo);
- this.panel1.Controls.Add(this.lb_guid);
- this.panel1.Controls.Add(this.txt_guid);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 177);
+ this.panel1.Size = new System.Drawing.Size(1126, 189);
this.panel1.TabIndex = 1;
+ //
+ // lb_itemModel
+ //
+ this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_itemModel.Appearance.Options.UseFont = true;
+ this.lb_itemModel.Location = new System.Drawing.Point(11, 139);
+ this.lb_itemModel.Name = "lb_itemModel";
+ this.lb_itemModel.Size = new System.Drawing.Size(68, 21);
+ this.lb_itemModel.TabIndex = 375;
+ this.lb_itemModel.Text = "鐗╂枡瑙勬牸";
+ //
+ // txt_itemModel
+ //
+ this.txt_itemModel.Location = new System.Drawing.Point(80, 136);
+ 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(530, 28);
+ this.txt_itemModel.TabIndex = 376;
+ //
+ // labelCreateDate
+ //
+ this.labelCreateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelCreateDate.Appearance.Options.UseFont = true;
+ this.labelCreateDate.Location = new System.Drawing.Point(633, 17);
+ this.labelCreateDate.Name = "labelCreateDate";
+ this.labelCreateDate.Size = new System.Drawing.Size(68, 21);
+ this.labelCreateDate.TabIndex = 373;
+ this.labelCreateDate.Text = "鍒朵綔鏃ユ湡";
+ //
+ // txt_createDate
+ //
+ this.txt_createDate.Location = new System.Drawing.Point(707, 14);
+ this.txt_createDate.Name = "txt_createDate";
+ this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_createDate.Properties.Appearance.Options.UseFont = true;
+ this.txt_createDate.Size = new System.Drawing.Size(178, 28);
+ this.txt_createDate.TabIndex = 374;
+ //
+ // labelUserName
+ //
+ this.labelUserName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelUserName.Appearance.Options.UseFont = true;
+ this.labelUserName.Location = new System.Drawing.Point(404, 17);
+ this.labelUserName.Name = "labelUserName";
+ this.labelUserName.Size = new System.Drawing.Size(51, 21);
+ this.labelUserName.TabIndex = 371;
+ this.labelUserName.Text = "鍒朵綔浜�";
+ //
+ // txt_userName
+ //
+ this.txt_userName.Location = new System.Drawing.Point(460, 13);
+ this.txt_userName.Name = "txt_userName";
+ this.txt_userName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_userName.Properties.Appearance.Options.UseFont = true;
+ this.txt_userName.Size = new System.Drawing.Size(150, 28);
+ this.txt_userName.TabIndex = 372;
//
// lbGuid
//
@@ -902,46 +978,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 = "username";
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 7;
- this.gridColumn1.Width = 94;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn2.FieldName = "itemmodel";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 5;
- this.gridColumn2.Width = 94;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
- this.gridColumn3.FieldName = "itemname";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 4;
- this.gridColumn3.Width = 94;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "鍒朵綔鏃堕棿";
- this.gridColumn4.FieldName = "createdate";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 6;
- this.gridColumn4.Width = 94;
//
// Frm_MesQmCheckitemDt
//
@@ -954,7 +990,6 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tname.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).EndInit();
@@ -964,10 +999,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_finspectionLevel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -978,6 +1011,9 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -1010,8 +1046,6 @@
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-private DevExpress.XtraEditors.LabelControl lb_itemId;
-private DevExpress.XtraEditors.TextEdit txt_itemId;
private DevExpress.XtraEditors.LabelControl lb_tname;
private DevExpress.XtraEditors.TextEdit txt_tname;
@@ -1046,9 +1080,6 @@
private DevExpress.XtraEditors.LabelControl lb_foneChecked;
private DevExpress.XtraEditors.TextEdit txt_foneChecked;
private DevExpress.XtraGrid.Columns.GridColumn gv_foneChecked;
-
-private DevExpress.XtraEditors.LabelControl lb_finspectionLevel;
-private DevExpress.XtraEditors.TextEdit txt_finspectionLevel;
private DevExpress.XtraGrid.Columns.GridColumn gv_name1;
private DevExpress.XtraEditors.LabelControl lb_itemNo;
@@ -1058,13 +1089,19 @@
private DevExpress.XtraEditors.LabelControl lb_memo;
private DevExpress.XtraEditors.TextEdit txt_memo;
private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
-
-private DevExpress.XtraEditors.LabelControl lb_guid;
-private DevExpress.XtraEditors.TextEdit txt_guid;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraEditors.LabelControl labelCreateDate;
+ private DevExpress.XtraEditors.TextEdit txt_createDate;
+ private DevExpress.XtraEditors.LabelControl labelUserName;
+ private DevExpress.XtraEditors.TextEdit txt_userName;
+ private DevExpress.XtraEditors.LabelControl lb_itemModel;
+ private DevExpress.XtraEditors.TextEdit txt_itemModel;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index a10c56c..5c49237 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -16,6 +16,7 @@
{
string _webServiceName = "MesQmCheckitemManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
+
public Frm_MesQmCheckitemDt()
{
InitializeComponent();
@@ -40,7 +41,9 @@
{
string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
Font f = new Font("寰蒋闆呴粦", 16);
- Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
+ Rectangle r = new Rectangle(
+ gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45,
+ e.Bounds.Right - 5, e.Bounds.Height - 5);
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
}
@@ -52,10 +55,13 @@
/// <param name="e"></param>
private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
{
- string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
+ string rowGuid =
+ Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1,
+ e, "guid");
if (!string.IsNullOrEmpty(rowGuid))
getModel(rowGuid, false, 999);
}
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -65,6 +71,7 @@
{
getPageList(curPage, pageSize);
}
+
/// <summary>
/// 鏌ヨ浜嬩欢
/// </summary>
@@ -72,10 +79,13 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+ Gs.DevApp.UserControl.ShowFilter frm =
+ new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns,
+ _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
+
/// <summary>
/// 鏌ヨ鍥炶皟
/// </summary>
@@ -111,20 +121,25 @@
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
+
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
return;
- List<dynamic> lst = new List<dynamic>();
- lst.Add(rowGuid);
- var _obj = lst;
+ List<dynamic> lst = new List<dynamic>();
+ lst.Add(rowGuid);
+ var _obj = lst;
try
{
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ string strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteModel",
+ JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn =
+ ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
getPageList(1, UtilityHelper.GetPageSize());
}
+
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
@@ -143,6 +158,7 @@
UtilityHelper.JumpToTab(xtraTabControl1, 0);
getPageList(1, UtilityHelper.GetPageSize());
}
+
/// <summary>
/// 淇敼浜嬩欢
/// </summary>
@@ -157,8 +173,10 @@
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
+
getModel(rowGuid, true, 1);
}
+
/// <summary>
/// 鏂板浜嬩欢
/// </summary>
@@ -166,13 +184,16 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
- lbGuid.Text = "";
- List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gridViews.Add(gvMx1);
- UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ UtilityHelper.JumpToTab(xtraTabControl1, 1);
+ lbGuid.Text = "";
+ List<GridView> gridViews =
+ new List<GridView>();
+ gridViews.Add(gvMx1);
+ UtilityHelper.CleanValueByControl(this.panel1.Controls, true,
+ gridViews);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
+
/// <summary>
/// 淇濆瓨浜嬩欢
/// </summary>
@@ -189,19 +210,22 @@
}
var _obj = new
{
- guid = lbGuid.Text.Trim(),//涓诲缓
-
+ guid = lbGuid.Text.Trim(), //涓诲缓
};
try
{
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ string strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModel",
+ JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn =
+ ToolBox.UtilityHelper.ReturnToDynamic(strJson);
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls,
+ false);
}
}
catch (Exception ex)
@@ -217,40 +241,47 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage, int pageSize)
{
- System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ System.Text.StringBuilder _sbSqlWhere =
+ new System.Text.StringBuilder();
foreach (FilterEntity itm in _filterList)
{
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
+ _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
+ itm.fileValue + "'");
}
- PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString());
+
+ PageQueryModel pgq = new PageQueryModel(curPage, pageSize,
+ "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
- ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+ string strReturn = UtilityHelper.HttpPost("",
+ _webServiceName + "GetListPageIQC", json);
+ ReturnModel<PageListModel> dd =
+ UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
- {
- DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- int dddd = dd.rtnData.pages;//鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
- pageBar1.setTxt();
- }
- else
- {
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
- }
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ int dddd = dd.rtnData.pages; //鎬婚〉
+ pageBar1.TotalPages = dddd;
+ pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
+ pageBar1.CurrentPage = curPage; //褰撳墠椤�
+ pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
+ pageBar1.setTxt();
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
}
catch (Exception ex)
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
if (string.IsNullOrEmpty(strGuid))
@@ -258,29 +289,38 @@
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
+
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
- guid = strGuid,//涓诲缓
+ guid = strGuid, //涓诲缓
};
try
{
- string strJson = UtilityHelper.HttpPost("", _webServiceName +"GetModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ string strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "GetModelIQC",
+ JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn =
+ ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList =
+ new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
+ UtilityHelper.SetValueByObj(this.panel1.Controls, dy,
+ isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
{
array.Add(a);
}
- DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+
+ DataTable dt =
+ JsonConvert.DeserializeObject<DataTable>(
+ array.ToString());
if (dt.Rows.Count > 0)
{
gcMx1.BindingContext = new BindingContext();
@@ -289,7 +329,8 @@
}
else
{
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1,
+ gvMx1);
}
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
index 28eabf1..b273f88 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs
@@ -2,10 +2,10 @@
namespace Gs.DevApp.DevFrm.QC.Models
{
- /// <summary>
- /// 妫�楠岄」鐩粠琛�
- /// </summary>
- public class MesQmCheckitemDt
+ /// <summary>
+ /// 妫�楠岄」鐩粠琛�
+ /// </summary>
+ public class MesQmCheckitemDt
{
/// <summary>
/// 榛樿鍊�: (newid())
@@ -214,5 +214,8 @@
/// <summary>
/// </summary>
public Guid? Pid { get; set; }
+
+
+ public string SampleSizeName { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3