From 07c98b01b357c37a75353370bc95430e814543f3 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 08 一月 2025 16:24:09 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs | 102 ---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 100 +-
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs | 116 ---
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs | 49
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 36
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 40 +
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs | 25
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs | 6
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 112 ---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs | 69 --
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs | 22
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 480 ++++++++--------
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs | 100 +-
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs | 410 +++-----------
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs | 1
17 files changed, 587 insertions(+), 1,085 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
index 6276265..8d8221d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -54,9 +54,6 @@
this.lb_isNg = new DevExpress.XtraEditors.LabelControl();
this.txt_isNg = new DevExpress.XtraEditors.TextEdit();
this.gv_isNg = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_isWy = new DevExpress.XtraEditors.LabelControl();
- this.txt_isWy = new DevExpress.XtraEditors.TextEdit();
- this.gv_isWy = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_depottype = new DevExpress.XtraEditors.LabelControl();
this.txt_depottype = new DevExpress.XtraEditors.TextEdit();
this.gv_depottype = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -100,7 +97,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isFkc.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
@@ -287,7 +283,7 @@
this.gv_isFkc.OptionsColumn.AllowEdit = false;
this.gv_isFkc.Tag = "query_a.is_fkc";
this.gv_isFkc.Visible = true;
- this.gv_isFkc.VisibleIndex = 8;
+ this.gv_isFkc.VisibleIndex = 7;
this.gv_isFkc.Width = 70;
//
// lb_zuid
@@ -321,14 +317,14 @@
this.gv_zuid.OptionsColumn.AllowEdit = false;
this.gv_zuid.Tag = "query_a.zuid";
this.gv_zuid.Visible = true;
- this.gv_zuid.VisibleIndex = 7;
+ this.gv_zuid.VisibleIndex = 6;
this.gv_zuid.Width = 71;
//
// lb_isNg
//
this.lb_isNg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isNg.Appearance.Options.UseFont = true;
- this.lb_isNg.Location = new System.Drawing.Point(914, 86);
+ this.lb_isNg.Location = new System.Drawing.Point(284, 88);
this.lb_isNg.Name = "lb_isNg";
this.lb_isNg.Size = new System.Drawing.Size(107, 21);
this.lb_isNg.TabIndex = 267;
@@ -337,7 +333,7 @@
// txt_isNg
//
this.txt_isNg.Enabled = false;
- this.txt_isNg.Location = new System.Drawing.Point(1026, 82);
+ this.txt_isNg.Location = new System.Drawing.Point(397, 84);
this.txt_isNg.Name = "txt_isNg";
this.txt_isNg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_isNg.Properties.Appearance.Options.UseFont = true;
@@ -355,42 +351,8 @@
this.gv_isNg.OptionsColumn.AllowEdit = false;
this.gv_isNg.Tag = "query_a.is_ng";
this.gv_isNg.Visible = true;
- this.gv_isNg.VisibleIndex = 6;
+ this.gv_isNg.VisibleIndex = 5;
this.gv_isNg.Width = 70;
- //
- // lb_isWy
- //
- this.lb_isWy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_isWy.Appearance.Options.UseFont = true;
- this.lb_isWy.Location = new System.Drawing.Point(756, 86);
- this.lb_isWy.Name = "lb_isWy";
- this.lb_isWy.Size = new System.Drawing.Size(107, 21);
- this.lb_isWy.TabIndex = 262;
- this.lb_isWy.Text = "鏄惁濮斿浠撳簱 ";
- //
- // txt_isWy
- //
- this.txt_isWy.Enabled = false;
- this.txt_isWy.Location = new System.Drawing.Point(869, 82);
- this.txt_isWy.Name = "txt_isWy";
- this.txt_isWy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_isWy.Properties.Appearance.Options.UseFont = true;
- this.txt_isWy.Size = new System.Drawing.Size(35, 28);
- this.txt_isWy.TabIndex = 262;
- //
- // gv_isWy
- //
- this.gv_isWy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_isWy.AppearanceCell.Options.UseFont = true;
- this.gv_isWy.Caption = "鏄惁濮斿浠撳簱";
- this.gv_isWy.FieldName = "isWy";
- this.gv_isWy.MinWidth = 70;
- this.gv_isWy.Name = "gv_isWy";
- this.gv_isWy.OptionsColumn.AllowEdit = false;
- this.gv_isWy.Tag = "query_a.is_wy";
- this.gv_isWy.Visible = true;
- this.gv_isWy.VisibleIndex = 5;
- this.gv_isWy.Width = 70;
//
// lb_depottype
//
@@ -628,7 +590,6 @@
this.gv_depotName,
this.gv_depottype,
this.gv_createBy,
- this.gv_isWy,
this.gv_isNg,
this.gv_zuid,
this.gv_isFkc,
@@ -660,11 +621,12 @@
// gridColumn2
//
this.gridColumn2.Caption = "绂佺敤鐘舵��";
+ this.gridColumn2.FieldName = "isNg";
this.gridColumn2.MinWidth = 50;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Tag = "query_a.zuid";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 9;
+ this.gridColumn2.VisibleIndex = 8;
this.gridColumn2.Width = 52;
//
// gridColumn6
@@ -675,7 +637,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "query_a.SUPPLIER_ID";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 10;
+ this.gridColumn6.VisibleIndex = 9;
this.gridColumn6.Width = 70;
//
// gridColumn5
@@ -686,7 +648,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "query_a.Client_Id";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 11;
+ this.gridColumn5.VisibleIndex = 10;
this.gridColumn5.Width = 60;
//
// gridColumn4
@@ -697,7 +659,7 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Tag = "query_a.department";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 12;
+ this.gridColumn4.VisibleIndex = 11;
this.gridColumn4.Width = 60;
//
// gridColumn7
@@ -708,7 +670,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Tag = "query_a.Phone";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 13;
+ this.gridColumn7.VisibleIndex = 12;
this.gridColumn7.Width = 60;
//
// gridColumn3
@@ -719,7 +681,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Tag = "query_a.lastupdate_date";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 14;
+ this.gridColumn3.VisibleIndex = 13;
this.gridColumn3.Width = 180;
//
// xtraTabControl1
@@ -784,8 +746,6 @@
this.panel1.Controls.Add(this.txt_zuid);
this.panel1.Controls.Add(this.lb_isNg);
this.panel1.Controls.Add(this.txt_isNg);
- this.panel1.Controls.Add(this.lb_isWy);
- this.panel1.Controls.Add(this.txt_isWy);
this.panel1.Controls.Add(this.lb_depottype);
this.panel1.Controls.Add(this.txt_depottype);
this.panel1.Controls.Add(this.lb_lastupdateDate);
@@ -842,7 +802,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isFkc.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
@@ -896,10 +855,6 @@
private DevExpress.XtraEditors.LabelControl lb_isNg;
private DevExpress.XtraEditors.TextEdit txt_isNg;
private DevExpress.XtraGrid.Columns.GridColumn gv_isNg;
-
- private DevExpress.XtraEditors.LabelControl lb_isWy;
- private DevExpress.XtraEditors.TextEdit txt_isWy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isWy;
private DevExpress.XtraEditors.LabelControl lb_depottype;
private DevExpress.XtraEditors.TextEdit txt_depottype;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
index 12dc251..0f2bf9b 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -33,8 +33,6 @@
this.lb_fforbidStatus = new DevExpress.XtraEditors.LabelControl();
this.txt_fforbidStatus = new DevExpress.XtraEditors.TextEdit();
this.gv_fforbidStatus = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_memo = new DevExpress.XtraEditors.LabelControl();
- this.txt_memo = new DevExpress.XtraEditors.TextEdit();
this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
@@ -46,11 +44,7 @@
this.lb_phoneNumber = new DevExpress.XtraEditors.LabelControl();
this.txt_phoneNumber = new DevExpress.XtraEditors.TextEdit();
this.gv_phoneNumber = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_positionName = new DevExpress.XtraEditors.LabelControl();
- this.txt_positionName = new DevExpress.XtraEditors.TextEdit();
this.gv_positionName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_positionCode = new DevExpress.XtraEditors.LabelControl();
- this.txt_positionCode = new DevExpress.XtraEditors.TextEdit();
this.gv_positionCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_departmentName = new DevExpress.XtraEditors.LabelControl();
this.txt_departmentName = new DevExpress.XtraEditors.TextEdit();
@@ -79,13 +73,10 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidStatus.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_startDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_phoneNumber.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_positionName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_positionCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_departmentName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_departmentNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_staffName.Properties)).BeginInit();
@@ -104,7 +95,7 @@
//
this.lb_fforbidStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fforbidStatus.Appearance.Options.UseFont = true;
- this.lb_fforbidStatus.Location = new System.Drawing.Point(32, 118);
+ this.lb_fforbidStatus.Location = new System.Drawing.Point(296, 84);
this.lb_fforbidStatus.Name = "lb_fforbidStatus";
this.lb_fforbidStatus.Size = new System.Drawing.Size(73, 21);
this.lb_fforbidStatus.TabIndex = 306;
@@ -112,7 +103,7 @@
//
// txt_fforbidStatus
//
- this.txt_fforbidStatus.Location = new System.Drawing.Point(113, 114);
+ this.txt_fforbidStatus.Location = new System.Drawing.Point(377, 80);
this.txt_fforbidStatus.Name = "txt_fforbidStatus";
this.txt_fforbidStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fforbidStatus.Properties.Appearance.Options.UseFont = true;
@@ -130,33 +121,14 @@
this.gv_fforbidStatus.OptionsColumn.AllowEdit = false;
this.gv_fforbidStatus.Tag = "query_a.fforbid_status";
this.gv_fforbidStatus.Visible = true;
- this.gv_fforbidStatus.VisibleIndex = 10;
+ this.gv_fforbidStatus.VisibleIndex = 8;
this.gv_fforbidStatus.Width = 50;
- //
- // lb_memo
- //
- 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(66, 150);
- this.lb_memo.Name = "lb_memo";
- this.lb_memo.Size = new System.Drawing.Size(39, 21);
- this.lb_memo.TabIndex = 285;
- this.lb_memo.Text = "澶囨敞 ";
- //
- // txt_memo
- //
- this.txt_memo.Location = new System.Drawing.Point(113, 146);
- 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.TabIndex = 285;
//
// lb_lastupdateDate
//
this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdateDate.Appearance.Options.UseFont = true;
- this.lb_lastupdateDate.Location = new System.Drawing.Point(569, 121);
+ this.lb_lastupdateDate.Location = new System.Drawing.Point(569, 84);
this.lb_lastupdateDate.Name = "lb_lastupdateDate";
this.lb_lastupdateDate.Size = new System.Drawing.Size(73, 21);
this.lb_lastupdateDate.TabIndex = 280;
@@ -164,7 +136,7 @@
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(653, 117);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(653, 80);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
@@ -175,7 +147,7 @@
//
this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remark.Appearance.Options.UseFont = true;
- this.lb_remark.Location = new System.Drawing.Point(330, 118);
+ this.lb_remark.Location = new System.Drawing.Point(66, 118);
this.lb_remark.Name = "lb_remark";
this.lb_remark.Size = new System.Drawing.Size(39, 21);
this.lb_remark.TabIndex = 235;
@@ -183,7 +155,7 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(377, 114);
+ this.txt_remark.Location = new System.Drawing.Point(113, 114);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
@@ -201,14 +173,14 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 9;
+ this.gv_remark.VisibleIndex = 7;
this.gv_remark.Width = 94;
//
// lb_startDate
//
this.lb_startDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_startDate.Appearance.Options.UseFont = true;
- this.lb_startDate.Location = new System.Drawing.Point(535, 84);
+ this.lb_startDate.Location = new System.Drawing.Point(535, 52);
this.lb_startDate.Name = "lb_startDate";
this.lb_startDate.Size = new System.Drawing.Size(107, 21);
this.lb_startDate.TabIndex = 231;
@@ -216,7 +188,7 @@
//
// txt_startDate
//
- this.txt_startDate.Location = new System.Drawing.Point(653, 80);
+ this.txt_startDate.Location = new System.Drawing.Point(653, 48);
this.txt_startDate.Name = "txt_startDate";
this.txt_startDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_startDate.Properties.Appearance.Options.UseFont = true;
@@ -234,7 +206,7 @@
this.gv_startDate.OptionsColumn.AllowEdit = false;
this.gv_startDate.Tag = "query_a.start_date";
this.gv_startDate.Visible = true;
- this.gv_startDate.VisibleIndex = 8;
+ this.gv_startDate.VisibleIndex = 6;
this.gv_startDate.Width = 180;
//
// lb_phoneNumber
@@ -267,27 +239,8 @@
this.gv_phoneNumber.OptionsColumn.AllowEdit = false;
this.gv_phoneNumber.Tag = "query_a.phone_number";
this.gv_phoneNumber.Visible = true;
- this.gv_phoneNumber.VisibleIndex = 7;
+ this.gv_phoneNumber.VisibleIndex = 5;
this.gv_phoneNumber.Width = 94;
- //
- // lb_positionName
- //
- this.lb_positionName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_positionName.Appearance.Options.UseFont = true;
- this.lb_positionName.Location = new System.Drawing.Point(296, 84);
- this.lb_positionName.Name = "lb_positionName";
- this.lb_positionName.Size = new System.Drawing.Size(73, 21);
- this.lb_positionName.TabIndex = 226;
- this.lb_positionName.Text = "宀椾綅鍚嶇О ";
- //
- // txt_positionName
- //
- this.txt_positionName.Location = new System.Drawing.Point(377, 80);
- this.txt_positionName.Name = "txt_positionName";
- this.txt_positionName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_positionName.Properties.Appearance.Options.UseFont = true;
- this.txt_positionName.Size = new System.Drawing.Size(150, 28);
- this.txt_positionName.TabIndex = 226;
//
// gv_positionName
//
@@ -299,28 +252,7 @@
this.gv_positionName.Name = "gv_positionName";
this.gv_positionName.OptionsColumn.AllowEdit = false;
this.gv_positionName.Tag = "query_a.position_name";
- this.gv_positionName.Visible = true;
- this.gv_positionName.VisibleIndex = 6;
this.gv_positionName.Width = 94;
- //
- // lb_positionCode
- //
- this.lb_positionCode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_positionCode.Appearance.Options.UseFont = true;
- this.lb_positionCode.Location = new System.Drawing.Point(569, 52);
- this.lb_positionCode.Name = "lb_positionCode";
- this.lb_positionCode.Size = new System.Drawing.Size(73, 21);
- this.lb_positionCode.TabIndex = 222;
- this.lb_positionCode.Text = "宀椾綅缂栫爜 ";
- //
- // txt_positionCode
- //
- this.txt_positionCode.Location = new System.Drawing.Point(653, 48);
- this.txt_positionCode.Name = "txt_positionCode";
- this.txt_positionCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_positionCode.Properties.Appearance.Options.UseFont = true;
- this.txt_positionCode.Size = new System.Drawing.Size(157, 28);
- this.txt_positionCode.TabIndex = 222;
//
// gv_positionCode
//
@@ -332,8 +264,6 @@
this.gv_positionCode.Name = "gv_positionCode";
this.gv_positionCode.OptionsColumn.AllowEdit = false;
this.gv_positionCode.Tag = "query_a.position_code";
- this.gv_positionCode.Visible = true;
- this.gv_positionCode.VisibleIndex = 5;
this.gv_positionCode.Width = 94;
//
// lb_departmentName
@@ -561,7 +491,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Tag = "query_a.lastupdate_date";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 11;
+ this.gridColumn2.VisibleIndex = 9;
this.gridColumn2.Width = 180;
//
// xtraTabControl1
@@ -610,8 +540,6 @@
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_fforbidStatus);
this.panel1.Controls.Add(this.txt_fforbidStatus);
- this.panel1.Controls.Add(this.lb_memo);
- this.panel1.Controls.Add(this.txt_memo);
this.panel1.Controls.Add(this.lb_lastupdateDate);
this.panel1.Controls.Add(this.txt_lastupdateDate);
this.panel1.Controls.Add(this.lb_remark);
@@ -620,10 +548,6 @@
this.panel1.Controls.Add(this.txt_startDate);
this.panel1.Controls.Add(this.lb_phoneNumber);
this.panel1.Controls.Add(this.txt_phoneNumber);
- this.panel1.Controls.Add(this.lb_positionName);
- this.panel1.Controls.Add(this.txt_positionName);
- this.panel1.Controls.Add(this.lb_positionCode);
- this.panel1.Controls.Add(this.txt_positionCode);
this.panel1.Controls.Add(this.lb_departmentName);
this.panel1.Controls.Add(this.txt_departmentName);
this.panel1.Controls.Add(this.lb_departmentNo);
@@ -637,7 +561,7 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(76, 20);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(830, 228);
+ this.panel1.Size = new System.Drawing.Size(875, 228);
this.panel1.TabIndex = 1;
//
// labelControl11
@@ -669,13 +593,10 @@
this.Name = "Frm_Staff";
this.Text = "鍛樺伐淇℃伅";
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidStatus.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_startDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_phoneNumber.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_positionName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_positionCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_departmentName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_departmentNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_staffName.Properties)).EndInit();
@@ -708,9 +629,6 @@
private DevExpress.XtraEditors.TextEdit txt_fforbidStatus;
private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidStatus;
- private DevExpress.XtraEditors.LabelControl lb_memo;
- private DevExpress.XtraEditors.TextEdit txt_memo;
-
private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
@@ -725,13 +643,7 @@
private DevExpress.XtraEditors.LabelControl lb_phoneNumber;
private DevExpress.XtraEditors.TextEdit txt_phoneNumber;
private DevExpress.XtraGrid.Columns.GridColumn gv_phoneNumber;
-
- private DevExpress.XtraEditors.LabelControl lb_positionName;
- private DevExpress.XtraEditors.TextEdit txt_positionName;
private DevExpress.XtraGrid.Columns.GridColumn gv_positionName;
-
- private DevExpress.XtraEditors.LabelControl lb_positionCode;
- private DevExpress.XtraEditors.TextEdit txt_positionCode;
private DevExpress.XtraGrid.Columns.GridColumn gv_positionCode;
private DevExpress.XtraEditors.LabelControl lb_departmentName;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
index 84a96ce..fad6bbd 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -41,12 +41,6 @@
this.lb_lxr = new DevExpress.XtraEditors.LabelControl();
this.txt_lxr = new DevExpress.XtraEditors.TextEdit();
this.gv_lxr = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_lotFlag = new DevExpress.XtraEditors.LabelControl();
- this.txt_lotFlag = new DevExpress.XtraEditors.TextEdit();
- this.lb_itemC = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemC = new DevExpress.XtraEditors.TextEdit();
- this.lb_fscode = new DevExpress.XtraEditors.LabelControl();
- this.txt_fscode = new DevExpress.XtraEditors.TextEdit();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -85,9 +79,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstaffid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lxr.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotFlag.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemC.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fscode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_telfx.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_telf1.Properties)).BeginInit();
@@ -205,68 +196,11 @@
this.gv_lxr.VisibleIndex = 4;
this.gv_lxr.Width = 70;
//
- // lb_lotFlag
- //
- this.lb_lotFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_lotFlag.Appearance.Options.UseFont = true;
- this.lb_lotFlag.Location = new System.Drawing.Point(534, 160);
- this.lb_lotFlag.Name = "lb_lotFlag";
- this.lb_lotFlag.Size = new System.Drawing.Size(172, 21);
- this.lb_lotFlag.TabIndex = 280;
- this.lb_lotFlag.Text = "鏄惁鎵规绠＄悊(鏄紝鍚�) ";
- //
- // txt_lotFlag
- //
- this.txt_lotFlag.Location = new System.Drawing.Point(717, 156);
- this.txt_lotFlag.Name = "txt_lotFlag";
- this.txt_lotFlag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_lotFlag.Properties.Appearance.Options.UseFont = true;
- this.txt_lotFlag.Size = new System.Drawing.Size(57, 28);
- this.txt_lotFlag.TabIndex = 280;
- //
- // lb_itemC
- //
- this.lb_itemC.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_itemC.Appearance.Options.UseFont = true;
- this.lb_itemC.Location = new System.Drawing.Point(534, 122);
- this.lb_itemC.Name = "lb_itemC";
- this.lb_itemC.Size = new System.Drawing.Size(172, 21);
- this.lb_itemC.TabIndex = 267;
- this.lb_itemC.Text = "鐗╂枡鏄惁鍏辩(鏄紝鍚�) ";
- //
- // txt_itemC
- //
- this.txt_itemC.Location = new System.Drawing.Point(717, 122);
- this.txt_itemC.Name = "txt_itemC";
- this.txt_itemC.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemC.Properties.Appearance.Options.UseFont = true;
- this.txt_itemC.Size = new System.Drawing.Size(57, 28);
- this.txt_itemC.TabIndex = 267;
- //
- // lb_fscode
- //
- this.lb_fscode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fscode.Appearance.Options.UseFont = true;
- this.lb_fscode.Location = new System.Drawing.Point(568, 86);
- this.lb_fscode.Name = "lb_fscode";
- this.lb_fscode.Size = new System.Drawing.Size(138, 21);
- this.lb_fscode.TabIndex = 252;
- this.lb_fscode.Text = "绠�鐮�(鎵撳嵃鏉＄爜鐢�) ";
- //
- // txt_fscode
- //
- this.txt_fscode.Location = new System.Drawing.Point(717, 82);
- this.txt_fscode.Name = "txt_fscode";
- this.txt_fscode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fscode.Properties.Appearance.Options.UseFont = true;
- this.txt_fscode.Size = new System.Drawing.Size(57, 28);
- this.txt_fscode.TabIndex = 252;
- //
// lb_remark
//
this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remark.Appearance.Options.UseFont = true;
- this.lb_remark.Location = new System.Drawing.Point(74, 198);
+ this.lb_remark.Location = new System.Drawing.Point(309, 167);
this.lb_remark.Name = "lb_remark";
this.lb_remark.Size = new System.Drawing.Size(39, 21);
this.lb_remark.TabIndex = 247;
@@ -274,11 +208,11 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(124, 194);
+ this.txt_remark.Location = new System.Drawing.Point(359, 163);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(385, 28);
+ this.txt_remark.Size = new System.Drawing.Size(420, 28);
this.txt_remark.TabIndex = 247;
//
// gv_remark
@@ -313,7 +247,7 @@
//
this.lb_telfx.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_telfx.Appearance.Options.UseFont = true;
- this.lb_telfx.Location = new System.Drawing.Point(310, 122);
+ this.lb_telfx.Location = new System.Drawing.Point(580, 83);
this.lb_telfx.Name = "lb_telfx";
this.lb_telfx.Size = new System.Drawing.Size(39, 21);
this.lb_telfx.TabIndex = 228;
@@ -321,7 +255,7 @@
//
// txt_telfx
//
- this.txt_telfx.Location = new System.Drawing.Point(359, 122);
+ this.txt_telfx.Location = new System.Drawing.Point(629, 83);
this.txt_telfx.Name = "txt_telfx";
this.txt_telfx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_telfx.Properties.Appearance.Options.UseFont = true;
@@ -365,7 +299,7 @@
//
this.lb_stras.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_stras.Appearance.Options.UseFont = true;
- this.lb_stras.Location = new System.Drawing.Point(310, 160);
+ this.lb_stras.Location = new System.Drawing.Point(310, 124);
this.lb_stras.Name = "lb_stras";
this.lb_stras.Size = new System.Drawing.Size(39, 21);
this.lb_stras.TabIndex = 222;
@@ -373,11 +307,11 @@
//
// txt_stras
//
- this.txt_stras.Location = new System.Drawing.Point(359, 156);
+ this.txt_stras.Location = new System.Drawing.Point(359, 120);
this.txt_stras.Name = "txt_stras";
this.txt_stras.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_stras.Properties.Appearance.Options.UseFont = true;
- this.txt_stras.Size = new System.Drawing.Size(150, 28);
+ this.txt_stras.Size = new System.Drawing.Size(420, 28);
this.txt_stras.TabIndex = 222;
//
// lb_land1
@@ -621,12 +555,6 @@
this.panel1.Controls.Add(this.txt_fstaffid);
this.panel1.Controls.Add(this.lb_lxr);
this.panel1.Controls.Add(this.txt_lxr);
- this.panel1.Controls.Add(this.lb_lotFlag);
- this.panel1.Controls.Add(this.txt_lotFlag);
- this.panel1.Controls.Add(this.lb_itemC);
- this.panel1.Controls.Add(this.txt_itemC);
- this.panel1.Controls.Add(this.lb_fscode);
- this.panel1.Controls.Add(this.txt_fscode);
this.panel1.Controls.Add(this.lb_remark);
this.panel1.Controls.Add(this.txt_remark);
this.panel1.Controls.Add(this.lb_telfx);
@@ -647,7 +575,7 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(76, 20);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(835, 293);
+ this.panel1.Size = new System.Drawing.Size(835, 271);
this.panel1.TabIndex = 1;
//
// txt_suppName
@@ -691,9 +619,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstaffid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lxr.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotFlag.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemC.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fscode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_telfx.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_telf1.Properties)).EndInit();
@@ -737,15 +662,6 @@
private DevExpress.XtraEditors.LabelControl lb_lxr;
private DevExpress.XtraEditors.TextEdit txt_lxr;
private DevExpress.XtraGrid.Columns.GridColumn gv_lxr;
-
- private DevExpress.XtraEditors.LabelControl lb_lotFlag;
- private DevExpress.XtraEditors.TextEdit txt_lotFlag;
-
- private DevExpress.XtraEditors.LabelControl lb_itemC;
- private DevExpress.XtraEditors.TextEdit txt_itemC;
-
- private DevExpress.XtraEditors.LabelControl lb_fscode;
- private DevExpress.XtraEditors.TextEdit txt_fscode;
private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
index 9be7693..311882a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
@@ -41,8 +41,8 @@
this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMx2 = new DevExpress.XtraGrid.GridControl();
- this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -84,8 +84,8 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMx1 = new DevExpress.XtraGrid.GridControl();
- this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -109,8 +109,8 @@
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tabMxPage2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
@@ -123,8 +123,8 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.xtraTabPage3.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
@@ -293,25 +293,25 @@
//
// tabMxPage2
//
- this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Controls.Add(this.gcMx1);
this.tabMxPage2.Name = "tabMxPage2";
this.tabMxPage2.Size = new System.Drawing.Size(1124, 388);
this.tabMxPage2.Text = "閫�璐х墿鏂欑敵璇�";
//
- // gcMx2
+ // gcMx1
//
- this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.Location = new System.Drawing.Point(0, 0);
- this.gcMx2.MainView = this.gvMx2;
- this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1124, 388);
- this.gcMx2.TabIndex = 0;
- this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx2});
+ this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ 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, 388);
+ this.gcMx1.TabIndex = 0;
+ this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx1});
//
- // gvMx2
+ // gvMx1
//
- this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn12,
this.gridColumn11,
this.gvMx2status,
@@ -328,11 +328,11 @@
this.gvMx2ebelnK3id,
this.gvMx2lineK3id,
this.gvMx2itemOutId});
- this.gvMx2.GridControl = this.gcMx2;
- this.gvMx2.Name = "gvMx2";
- this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
- this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx2.OptionsView.ShowGroupPanel = false;
+ this.gvMx1.GridControl = this.gcMx1;
+ this.gvMx1.Name = "gvMx1";
+ this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+ this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx1.OptionsView.ShowGroupPanel = false;
//
// gridColumn12
//
@@ -808,25 +808,25 @@
//
// xtraTabPage3
//
- this.xtraTabPage3.Controls.Add(this.gcMx1);
+ this.xtraTabPage3.Controls.Add(this.gcMx2);
this.xtraTabPage3.Name = "xtraTabPage3";
this.xtraTabPage3.Size = new System.Drawing.Size(1124, 388);
this.xtraTabPage3.Text = "閫�璐х墿鏂欐壂鐮�";
//
- // gcMx1
+ // gcMx2
//
- this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- 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, 388);
- this.gcMx1.TabIndex = 1;
- this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx1});
+ this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.Location = new System.Drawing.Point(0, 0);
+ this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Name = "gcMx2";
+ this.gcMx2.Size = new System.Drawing.Size(1124, 388);
+ this.gcMx2.TabIndex = 1;
+ this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx2});
//
- // gvMx1
+ // gvMx2
//
- this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1itemBarcode,
this.gvMx1itemNo,
@@ -838,11 +838,11 @@
this.gvMx1depotSectionCode,
this.gvMx1ebelnK3id,
this.gvMx1lineK3id});
- this.gvMx1.GridControl = this.gcMx1;
- this.gvMx1.Name = "gvMx1";
- this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
- this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.ShowGroupPanel = false;
+ this.gvMx2.GridControl = this.gcMx2;
+ this.gvMx2.Name = "gvMx2";
+ this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx2.OptionsView.ShowGroupPanel = false;
//
// gvMx1guid
//
@@ -1121,8 +1121,8 @@
this.Name = "Frm_MesCgthSqDj";
this.Text = "閲囪喘閫�璐х敵璇�";
this.tabMxPage2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
@@ -1135,8 +1135,8 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.xtraTabPage3.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
@@ -1175,8 +1175,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
private DevExpress.XtraTab.XtraTabPage tabMxPage2;
- private DevExpress.XtraGrid.GridControl gcMx2;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraEditors.LabelControl lb_fmrmode;
private DevExpress.XtraGrid.Columns.GridColumn gv_fmrmode;
@@ -1218,8 +1218,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraGrid.GridControl gcMx2;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
index 7ab4b5b..bdb7660 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
@@ -208,8 +208,8 @@
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
gvList.Add(gvMx2);
+ gvList.Add(gvMx1);
UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
@@ -217,19 +217,19 @@
{
array.Add(a);
}
- //杩欐槸鎵爜琛�
+ //杩欐槸閫�璐ф槑缁� 琛�
DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
if (dt.Rows.Count > 0)
{
- gcMx1.BindingContext = new BindingContext();
- gcMx1.DataSource = dt;
- gcMx1.ForceInitialize();
+ gcMx2.BindingContext = new BindingContext();
+ gcMx2.DataSource = dt;
+ gcMx2.ForceInitialize();
}
else
{
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
- //杩欐槸閫�璐ф槑缁� 琛�
+ //杩欐槸鎵爜琛�
JArray array1 = new JArray();
foreach (var a in _job["rtnData"]["list2"])
{
@@ -238,13 +238,13 @@
DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
if (dt1.Rows.Count > 0)
{
- gcMx2.BindingContext = new BindingContext();
- gcMx2.DataSource = dt1;
- gcMx2.ForceInitialize();
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = dt1;
+ gcMx1.ForceInitialize();
}
else
{
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs
index 7eefd86..4450ae4 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs
@@ -370,11 +370,11 @@
//
// txt_typeMemo
//
- this.txt_typeMemo.Enabled = false;
this.txt_typeMemo.Location = new System.Drawing.Point(423, 99);
this.txt_typeMemo.Name = "txt_typeMemo";
this.txt_typeMemo.Size = new System.Drawing.Size(210, 38);
this.txt_typeMemo.TabIndex = 308;
+ this.txt_typeMemo.Tag = "readOnly";
//
// lb_typeMemo
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index c41ea8a..1d9b506 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -43,27 +43,48 @@
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
+ this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gvMx2fsampleSizeWord = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gvMx2guid = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gvMx2aql1Id = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gvMx2fsampleSizeWord = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2sampleSizeWord = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand30 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql00010 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql00015 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql00025 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql00040 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql00065 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql0010 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand33 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql0015 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand32 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql0025 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand31 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql0040 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand36 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql0065 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand35 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql0100 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand38 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql0150 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand34 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql0250 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand37 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql0400 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql0650 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand39 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2aql1000 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx2memo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMxDel2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.advBandedGridView1 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
@@ -157,7 +178,7 @@
this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.lb_createName = new DevExpress.XtraEditors.LabelControl();
- this.txt_createName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.gv_createName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
@@ -174,27 +195,6 @@
this.txt_isenabled = new DevExpress.XtraEditors.CheckEdit();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand30 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand33 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand32 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand31 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand36 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand35 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand38 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand34 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand37 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand39 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
@@ -214,7 +214,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -322,6 +322,28 @@
this.gvMx2.OptionsView.ShowColumnHeaders = false;
this.gvMx2.OptionsView.ShowGroupPanel = false;
//
+ // gridBand19
+ //
+ this.gridBand19.Caption = "鏍锋湰澶у皬";
+ this.gridBand19.Columns.Add(this.gvMx2fsampleSizeWord);
+ this.gridBand19.Columns.Add(this.gvMx2guid);
+ this.gridBand19.Columns.Add(this.gvMx2aql1Id);
+ this.gridBand19.Name = "gridBand19";
+ this.gridBand19.VisibleIndex = 0;
+ this.gridBand19.Width = 81;
+ //
+ // gvMx2fsampleSizeWord
+ //
+ this.gvMx2fsampleSizeWord.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx2fsampleSizeWord.AppearanceCell.Options.UseFont = true;
+ this.gvMx2fsampleSizeWord.Caption = "鏍锋湰澶у皬";
+ this.gvMx2fsampleSizeWord.FieldName = "fsampleSizeWord";
+ this.gvMx2fsampleSizeWord.MinWidth = 50;
+ this.gvMx2fsampleSizeWord.Name = "gvMx2fsampleSizeWord";
+ this.gvMx2fsampleSizeWord.Tag = "yz_quantity_0_edit";
+ this.gvMx2fsampleSizeWord.Visible = true;
+ this.gvMx2fsampleSizeWord.Width = 81;
+ //
// gvMx2guid
//
this.gvMx2guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -346,17 +368,13 @@
this.gvMx2aql1Id.Tag = "query_a.AQL1_ID";
this.gvMx2aql1Id.Width = 94;
//
- // gvMx2fsampleSizeWord
+ // gridBand20
//
- this.gvMx2fsampleSizeWord.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2fsampleSizeWord.AppearanceCell.Options.UseFont = true;
- this.gvMx2fsampleSizeWord.Caption = "鏍锋湰澶у皬";
- this.gvMx2fsampleSizeWord.FieldName = "fsampleSizeWord";
- this.gvMx2fsampleSizeWord.MinWidth = 50;
- this.gvMx2fsampleSizeWord.Name = "gvMx2fsampleSizeWord";
- this.gvMx2fsampleSizeWord.Tag = "yz_quantity_0_edit";
- this.gvMx2fsampleSizeWord.Visible = true;
- this.gvMx2fsampleSizeWord.Width = 81;
+ this.gridBand20.Caption = "鏍锋湰澶у皬瀛楃爜";
+ this.gridBand20.Columns.Add(this.gvMx2sampleSizeWord);
+ this.gridBand20.Name = "gridBand20";
+ this.gridBand20.VisibleIndex = 1;
+ this.gridBand20.Width = 100;
//
// gvMx2sampleSizeWord
//
@@ -371,6 +389,41 @@
this.gvMx2sampleSizeWord.Visible = true;
this.gvMx2sampleSizeWord.Width = 100;
//
+ // gridBand21
+ //
+ this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand21.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand21.Caption = "鎷掓敹璐ㄩ噺姘村钩";
+ this.gridBand21.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand30,
+ this.gridBand29,
+ this.gridBand28,
+ this.gridBand27,
+ this.gridBand26,
+ this.gridBand25,
+ this.gridBand33,
+ this.gridBand32,
+ this.gridBand31,
+ this.gridBand36,
+ this.gridBand35,
+ this.gridBand38,
+ this.gridBand34,
+ this.gridBand37,
+ this.gridBand24,
+ this.gridBand39});
+ this.gridBand21.ImageOptions.Alignment = System.Drawing.StringAlignment.Center;
+ this.gridBand21.Name = "gridBand21";
+ this.gridBand21.VisibleIndex = 2;
+ this.gridBand21.Width = 800;
+ //
+ // gridBand30
+ //
+ this.gridBand30.Caption = "0.010";
+ this.gridBand30.Columns.Add(this.gvMx2aql00010);
+ this.gridBand30.Name = "gridBand30";
+ this.gridBand30.VisibleIndex = 0;
+ this.gridBand30.Width = 50;
+ //
// gvMx2aql00010
//
this.gvMx2aql00010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -382,6 +435,14 @@
this.gvMx2aql00010.Tag = "yz_quantity_0_edit";
this.gvMx2aql00010.Visible = true;
this.gvMx2aql00010.Width = 50;
+ //
+ // gridBand29
+ //
+ this.gridBand29.Caption = "0.015";
+ this.gridBand29.Columns.Add(this.gvMx2aql00015);
+ this.gridBand29.Name = "gridBand29";
+ this.gridBand29.VisibleIndex = 1;
+ this.gridBand29.Width = 50;
//
// gvMx2aql00015
//
@@ -395,6 +456,14 @@
this.gvMx2aql00015.Visible = true;
this.gvMx2aql00015.Width = 50;
//
+ // gridBand28
+ //
+ this.gridBand28.Caption = "0.025";
+ this.gridBand28.Columns.Add(this.gvMx2aql00025);
+ this.gridBand28.Name = "gridBand28";
+ this.gridBand28.VisibleIndex = 2;
+ this.gridBand28.Width = 50;
+ //
// gvMx2aql00025
//
this.gvMx2aql00025.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -406,6 +475,14 @@
this.gvMx2aql00025.Tag = "yz_quantity_0_edit";
this.gvMx2aql00025.Visible = true;
this.gvMx2aql00025.Width = 50;
+ //
+ // gridBand27
+ //
+ this.gridBand27.Caption = "0.040";
+ this.gridBand27.Columns.Add(this.gvMx2aql00040);
+ this.gridBand27.Name = "gridBand27";
+ this.gridBand27.VisibleIndex = 3;
+ this.gridBand27.Width = 50;
//
// gvMx2aql00040
//
@@ -419,6 +496,14 @@
this.gvMx2aql00040.Visible = true;
this.gvMx2aql00040.Width = 50;
//
+ // gridBand26
+ //
+ this.gridBand26.Caption = "0.065";
+ this.gridBand26.Columns.Add(this.gvMx2aql00065);
+ this.gridBand26.Name = "gridBand26";
+ this.gridBand26.VisibleIndex = 4;
+ this.gridBand26.Width = 50;
+ //
// gvMx2aql00065
//
this.gvMx2aql00065.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -430,6 +515,14 @@
this.gvMx2aql00065.Tag = "yz_quantity_0_edit";
this.gvMx2aql00065.Visible = true;
this.gvMx2aql00065.Width = 50;
+ //
+ // gridBand25
+ //
+ this.gridBand25.Caption = "0.10";
+ this.gridBand25.Columns.Add(this.gvMx2aql0010);
+ this.gridBand25.Name = "gridBand25";
+ this.gridBand25.VisibleIndex = 5;
+ this.gridBand25.Width = 50;
//
// gvMx2aql0010
//
@@ -443,6 +536,14 @@
this.gvMx2aql0010.Visible = true;
this.gvMx2aql0010.Width = 50;
//
+ // gridBand33
+ //
+ this.gridBand33.Caption = "0.15";
+ this.gridBand33.Columns.Add(this.gvMx2aql0015);
+ this.gridBand33.Name = "gridBand33";
+ this.gridBand33.VisibleIndex = 6;
+ this.gridBand33.Width = 50;
+ //
// gvMx2aql0015
//
this.gvMx2aql0015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -454,6 +555,14 @@
this.gvMx2aql0015.Tag = "yz_quantity_0_edit";
this.gvMx2aql0015.Visible = true;
this.gvMx2aql0015.Width = 50;
+ //
+ // gridBand32
+ //
+ this.gridBand32.Caption = "0.25";
+ this.gridBand32.Columns.Add(this.gvMx2aql0025);
+ this.gridBand32.Name = "gridBand32";
+ this.gridBand32.VisibleIndex = 7;
+ this.gridBand32.Width = 50;
//
// gvMx2aql0025
//
@@ -467,6 +576,14 @@
this.gvMx2aql0025.Visible = true;
this.gvMx2aql0025.Width = 50;
//
+ // gridBand31
+ //
+ this.gridBand31.Caption = "0.40";
+ this.gridBand31.Columns.Add(this.gvMx2aql0040);
+ this.gridBand31.Name = "gridBand31";
+ this.gridBand31.VisibleIndex = 8;
+ this.gridBand31.Width = 50;
+ //
// gvMx2aql0040
//
this.gvMx2aql0040.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -478,6 +595,14 @@
this.gvMx2aql0040.Tag = "yz_quantity_0_edit";
this.gvMx2aql0040.Visible = true;
this.gvMx2aql0040.Width = 50;
+ //
+ // gridBand36
+ //
+ this.gridBand36.Caption = "0.65";
+ this.gridBand36.Columns.Add(this.gvMx2aql0065);
+ this.gridBand36.Name = "gridBand36";
+ this.gridBand36.VisibleIndex = 9;
+ this.gridBand36.Width = 50;
//
// gvMx2aql0065
//
@@ -491,6 +616,14 @@
this.gvMx2aql0065.Visible = true;
this.gvMx2aql0065.Width = 50;
//
+ // gridBand35
+ //
+ this.gridBand35.Caption = "1.0";
+ this.gridBand35.Columns.Add(this.gvMx2aql0100);
+ this.gridBand35.Name = "gridBand35";
+ this.gridBand35.VisibleIndex = 10;
+ this.gridBand35.Width = 50;
+ //
// gvMx2aql0100
//
this.gvMx2aql0100.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -502,6 +635,14 @@
this.gvMx2aql0100.Tag = "yz_quantity_0_edit";
this.gvMx2aql0100.Visible = true;
this.gvMx2aql0100.Width = 50;
+ //
+ // gridBand38
+ //
+ this.gridBand38.Caption = "1.5";
+ this.gridBand38.Columns.Add(this.gvMx2aql0150);
+ this.gridBand38.Name = "gridBand38";
+ this.gridBand38.VisibleIndex = 11;
+ this.gridBand38.Width = 50;
//
// gvMx2aql0150
//
@@ -515,6 +656,14 @@
this.gvMx2aql0150.Visible = true;
this.gvMx2aql0150.Width = 50;
//
+ // gridBand34
+ //
+ this.gridBand34.Caption = "2.5";
+ this.gridBand34.Columns.Add(this.gvMx2aql0250);
+ this.gridBand34.Name = "gridBand34";
+ this.gridBand34.VisibleIndex = 12;
+ this.gridBand34.Width = 50;
+ //
// gvMx2aql0250
//
this.gvMx2aql0250.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -526,6 +675,14 @@
this.gvMx2aql0250.Tag = "yz_quantity_0_edit";
this.gvMx2aql0250.Visible = true;
this.gvMx2aql0250.Width = 50;
+ //
+ // gridBand37
+ //
+ this.gridBand37.Caption = "4.0";
+ this.gridBand37.Columns.Add(this.gvMx2aql0400);
+ this.gridBand37.Name = "gridBand37";
+ this.gridBand37.VisibleIndex = 13;
+ this.gridBand37.Width = 50;
//
// gvMx2aql0400
//
@@ -539,6 +696,14 @@
this.gvMx2aql0400.Visible = true;
this.gvMx2aql0400.Width = 50;
//
+ // gridBand24
+ //
+ this.gridBand24.Caption = "6.5";
+ this.gridBand24.Columns.Add(this.gvMx2aql0650);
+ this.gridBand24.Name = "gridBand24";
+ this.gridBand24.VisibleIndex = 14;
+ this.gridBand24.Width = 50;
+ //
// gvMx2aql0650
//
this.gvMx2aql0650.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -550,6 +715,14 @@
this.gvMx2aql0650.Tag = "yz_quantity_0_edit";
this.gvMx2aql0650.Visible = true;
this.gvMx2aql0650.Width = 50;
+ //
+ // gridBand39
+ //
+ this.gridBand39.Caption = "10";
+ this.gridBand39.Columns.Add(this.gvMx2aql1000);
+ this.gridBand39.Name = "gridBand39";
+ this.gridBand39.VisibleIndex = 15;
+ this.gridBand39.Width = 50;
//
// gvMx2aql1000
//
@@ -563,6 +736,14 @@
this.gvMx2aql1000.Visible = true;
this.gvMx2aql1000.Width = 50;
//
+ // gridBand22
+ //
+ this.gridBand22.Caption = "澶囨敞";
+ this.gridBand22.Columns.Add(this.gvMx2memo);
+ this.gridBand22.Name = "gridBand22";
+ this.gridBand22.VisibleIndex = 3;
+ this.gridBand22.Width = 100;
+ //
// gvMx2memo
//
this.gvMx2memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -574,6 +755,14 @@
this.gvMx2memo.Tag = "edit";
this.gvMx2memo.Visible = true;
this.gvMx2memo.Width = 100;
+ //
+ // gridBand23
+ //
+ this.gridBand23.Caption = "绉婚櫎";
+ this.gridBand23.Columns.Add(this.gvMxDel2);
+ this.gridBand23.Name = "gridBand23";
+ this.gridBand23.VisibleIndex = 4;
+ this.gridBand23.Width = 100;
//
// gvMxDel2
//
@@ -1354,13 +1543,13 @@
//
// txt_ftwoCheckdate
//
- this.txt_ftwoCheckdate.Enabled = false;
this.txt_ftwoCheckdate.Location = new System.Drawing.Point(611, 50);
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(165, 28);
this.txt_ftwoCheckdate.TabIndex = 262;
+ this.txt_ftwoCheckdate.Tag = "readOnly";
//
// gv_ftwoCheckdate
//
@@ -1388,13 +1577,13 @@
//
// txt_ftwoCheckor
//
- this.txt_ftwoCheckor.Enabled = false;
this.txt_ftwoCheckor.Location = new System.Drawing.Point(611, 16);
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;
this.txt_ftwoCheckor.Size = new System.Drawing.Size(165, 28);
this.txt_ftwoCheckor.TabIndex = 258;
+ this.txt_ftwoCheckor.Tag = "readOnly";
//
// gv_ftwoCheckor
//
@@ -1446,13 +1635,13 @@
//
// txt_foneCheckdate
//
- this.txt_foneCheckdate.Enabled = false;
this.txt_foneCheckdate.Location = new System.Drawing.Point(858, 50);
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(177, 28);
this.txt_foneCheckdate.TabIndex = 247;
+ this.txt_foneCheckdate.Tag = "readOnly";
//
// gv_foneCheckdate
//
@@ -1480,13 +1669,13 @@
//
// txt_foneCheckor
//
- this.txt_foneCheckor.Enabled = false;
this.txt_foneCheckor.Location = new System.Drawing.Point(858, 16);
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;
this.txt_foneCheckor.Size = new System.Drawing.Size(177, 28);
this.txt_foneCheckor.TabIndex = 243;
+ this.txt_foneCheckor.Tag = "readOnly";
//
// gv_foneCheckor
//
@@ -1637,13 +1826,13 @@
//
// txt_createDate
//
- this.txt_createDate.Enabled = false;
this.txt_createDate.Location = new System.Drawing.Point(344, 50);
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(180, 28);
this.txt_createDate.TabIndex = 216;
+ this.txt_createDate.Tag = "readOnly";
//
// lb_createName
//
@@ -1655,22 +1844,22 @@
this.lb_createName.TabIndex = 213;
this.lb_createName.Text = "鍒朵綔浜哄鍚�";
//
- // txt_createName
+ // txt_createBy
//
- this.txt_createName.Enabled = false;
- this.txt_createName.Location = new System.Drawing.Point(344, 16);
- this.txt_createName.Name = "txt_createName";
- this.txt_createName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createName.Properties.Appearance.Options.UseFont = true;
- this.txt_createName.Size = new System.Drawing.Size(180, 28);
- this.txt_createName.TabIndex = 213;
+ this.txt_createBy.Location = new System.Drawing.Point(344, 16);
+ this.txt_createBy.Name = "txt_createBy";
+ this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_createBy.Size = new System.Drawing.Size(180, 28);
+ this.txt_createBy.TabIndex = 213;
+ this.txt_createBy.Tag = "readOnly";
//
// gv_createName
//
this.gv_createName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_createName.AppearanceCell.Options.UseFont = true;
this.gv_createName.Caption = "鍒朵綔浜哄鍚�";
- this.gv_createName.FieldName = "createName";
+ this.gv_createName.FieldName = "createBy";
this.gv_createName.MinWidth = 50;
this.gv_createName.Name = "gv_createName";
this.gv_createName.OptionsColumn.AllowEdit = false;
@@ -1824,7 +2013,7 @@
this.panel1.Controls.Add(this.lb_createDate);
this.panel1.Controls.Add(this.txt_createDate);
this.panel1.Controls.Add(this.lb_createName);
- this.panel1.Controls.Add(this.txt_createName);
+ this.panel1.Controls.Add(this.txt_createBy);
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);
@@ -1878,195 +2067,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridBand19
- //
- this.gridBand19.Caption = "鏍锋湰澶у皬";
- this.gridBand19.Columns.Add(this.gvMx2fsampleSizeWord);
- this.gridBand19.Columns.Add(this.gvMx2guid);
- this.gridBand19.Columns.Add(this.gvMx2aql1Id);
- this.gridBand19.Name = "gridBand19";
- this.gridBand19.VisibleIndex = 0;
- this.gridBand19.Width = 81;
- //
- // gridBand20
- //
- this.gridBand20.Caption = "鏍锋湰澶у皬瀛楃爜";
- this.gridBand20.Columns.Add(this.gvMx2sampleSizeWord);
- this.gridBand20.Name = "gridBand20";
- this.gridBand20.VisibleIndex = 1;
- this.gridBand20.Width = 100;
- //
- // gridBand21
- //
- this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand21.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand21.Caption = "鎷掓敹璐ㄩ噺姘村钩";
- this.gridBand21.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand30,
- this.gridBand29,
- this.gridBand28,
- this.gridBand27,
- this.gridBand26,
- this.gridBand25,
- this.gridBand33,
- this.gridBand32,
- this.gridBand31,
- this.gridBand36,
- this.gridBand35,
- this.gridBand38,
- this.gridBand34,
- this.gridBand37,
- this.gridBand24,
- this.gridBand39});
- this.gridBand21.ImageOptions.Alignment = System.Drawing.StringAlignment.Center;
- this.gridBand21.Name = "gridBand21";
- this.gridBand21.VisibleIndex = 2;
- this.gridBand21.Width = 800;
- //
- // gridBand30
- //
- this.gridBand30.Caption = "0.010";
- this.gridBand30.Columns.Add(this.gvMx2aql00010);
- this.gridBand30.Name = "gridBand30";
- this.gridBand30.VisibleIndex = 0;
- this.gridBand30.Width = 50;
- //
- // gridBand29
- //
- this.gridBand29.Caption = "0.015";
- this.gridBand29.Columns.Add(this.gvMx2aql00015);
- this.gridBand29.Name = "gridBand29";
- this.gridBand29.VisibleIndex = 1;
- this.gridBand29.Width = 50;
- //
- // gridBand28
- //
- this.gridBand28.Caption = "0.025";
- this.gridBand28.Columns.Add(this.gvMx2aql00025);
- this.gridBand28.Name = "gridBand28";
- this.gridBand28.VisibleIndex = 2;
- this.gridBand28.Width = 50;
- //
- // gridBand27
- //
- this.gridBand27.Caption = "0.040";
- this.gridBand27.Columns.Add(this.gvMx2aql00040);
- this.gridBand27.Name = "gridBand27";
- this.gridBand27.VisibleIndex = 3;
- this.gridBand27.Width = 50;
- //
- // gridBand26
- //
- this.gridBand26.Caption = "0.065";
- this.gridBand26.Columns.Add(this.gvMx2aql00065);
- this.gridBand26.Name = "gridBand26";
- this.gridBand26.VisibleIndex = 4;
- this.gridBand26.Width = 50;
- //
- // gridBand25
- //
- this.gridBand25.Caption = "0.10";
- this.gridBand25.Columns.Add(this.gvMx2aql0010);
- this.gridBand25.Name = "gridBand25";
- this.gridBand25.VisibleIndex = 5;
- this.gridBand25.Width = 50;
- //
- // gridBand33
- //
- this.gridBand33.Caption = "0.15";
- this.gridBand33.Columns.Add(this.gvMx2aql0015);
- this.gridBand33.Name = "gridBand33";
- this.gridBand33.VisibleIndex = 6;
- this.gridBand33.Width = 50;
- //
- // gridBand32
- //
- this.gridBand32.Caption = "0.25";
- this.gridBand32.Columns.Add(this.gvMx2aql0025);
- this.gridBand32.Name = "gridBand32";
- this.gridBand32.VisibleIndex = 7;
- this.gridBand32.Width = 50;
- //
- // gridBand31
- //
- this.gridBand31.Caption = "0.40";
- this.gridBand31.Columns.Add(this.gvMx2aql0040);
- this.gridBand31.Name = "gridBand31";
- this.gridBand31.VisibleIndex = 8;
- this.gridBand31.Width = 50;
- //
- // gridBand36
- //
- this.gridBand36.Caption = "0.65";
- this.gridBand36.Columns.Add(this.gvMx2aql0065);
- this.gridBand36.Name = "gridBand36";
- this.gridBand36.VisibleIndex = 9;
- this.gridBand36.Width = 50;
- //
- // gridBand35
- //
- this.gridBand35.Caption = "1.0";
- this.gridBand35.Columns.Add(this.gvMx2aql0100);
- this.gridBand35.Name = "gridBand35";
- this.gridBand35.VisibleIndex = 10;
- this.gridBand35.Width = 50;
- //
- // gridBand38
- //
- this.gridBand38.Caption = "1.5";
- this.gridBand38.Columns.Add(this.gvMx2aql0150);
- this.gridBand38.Name = "gridBand38";
- this.gridBand38.VisibleIndex = 11;
- this.gridBand38.Width = 50;
- //
- // gridBand34
- //
- this.gridBand34.Caption = "2.5";
- this.gridBand34.Columns.Add(this.gvMx2aql0250);
- this.gridBand34.Name = "gridBand34";
- this.gridBand34.VisibleIndex = 12;
- this.gridBand34.Width = 50;
- //
- // gridBand37
- //
- this.gridBand37.Caption = "4.0";
- this.gridBand37.Columns.Add(this.gvMx2aql0400);
- this.gridBand37.Name = "gridBand37";
- this.gridBand37.VisibleIndex = 13;
- this.gridBand37.Width = 50;
- //
- // gridBand24
- //
- this.gridBand24.Caption = "6.5";
- this.gridBand24.Columns.Add(this.gvMx2aql0650);
- this.gridBand24.Name = "gridBand24";
- this.gridBand24.VisibleIndex = 14;
- this.gridBand24.Width = 50;
- //
- // gridBand39
- //
- this.gridBand39.Caption = "10";
- this.gridBand39.Columns.Add(this.gvMx2aql1000);
- this.gridBand39.Name = "gridBand39";
- this.gridBand39.VisibleIndex = 15;
- this.gridBand39.Width = 50;
- //
- // gridBand22
- //
- this.gridBand22.Caption = "澶囨敞";
- this.gridBand22.Columns.Add(this.gvMx2memo);
- this.gridBand22.Name = "gridBand22";
- this.gridBand22.VisibleIndex = 3;
- this.gridBand22.Width = 100;
- //
- // gridBand23
- //
- this.gridBand23.Caption = "绉婚櫎";
- this.gridBand23.Columns.Add(this.gvMxDel2);
- this.gridBand23.Name = "gridBand23";
- this.gridBand23.VisibleIndex = 4;
- this.gridBand23.Width = 100;
- //
// Frm_MesQmAql1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2096,7 +2096,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sampleSizeNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -2174,7 +2174,7 @@
private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraEditors.LabelControl lb_createName;
- private DevExpress.XtraEditors.TextEdit txt_createName;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createName;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraEditors.CheckEdit txt_isenabled;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
index 603eeab..63362cb 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -32,40 +32,17 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.panel1 = new System.Windows.Forms.Panel();
- this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
- this.txt_fid = new DevExpress.XtraEditors.TextEdit();
- this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
- this.txt_isStatus = new System.Windows.Forms.CheckBox();
- this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
- this.txt_fNumber = new DevExpress.XtraEditors.TextEdit();
- this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
- this.label1 = new System.Windows.Forms.Label();
- this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
- this.txt_upGuid = new System.Windows.Forms.ComboBox();
- this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
- this.lbGuid = new System.Windows.Forms.Label();
- this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
- this.txt_conTel = new DevExpress.XtraEditors.TextEdit();
- this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
- this.txt_conPeople = new DevExpress.XtraEditors.TextEdit();
- this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
- this.txt_name = new DevExpress.XtraEditors.TextEdit();
- this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- this.tlMenu = new System.Windows.Forms.TreeView();
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
- this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fid.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fNumber.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_conTel.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_conPeople.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -96,280 +73,93 @@
//
// xtraTabPage1
//
- this.xtraTabPage1.Controls.Add(this.panel1);
- this.xtraTabPage1.Controls.Add(this.tlMenu);
+ this.xtraTabPage1.Controls.Add(this.gcMain);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1072, 584);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
- // panel1
+ // gcMain
//
- this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.labelControl14);
- this.panel1.Controls.Add(this.txt_fid);
- this.panel1.Controls.Add(this.labelControl13);
- this.panel1.Controls.Add(this.txt_isStatus);
- this.panel1.Controls.Add(this.labelControl10);
- this.panel1.Controls.Add(this.txt_fNumber);
- this.panel1.Controls.Add(this.labelControl9);
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.label1);
- this.panel1.Controls.Add(this.labelControl8);
- this.panel1.Controls.Add(this.txt_upGuid);
- this.panel1.Controls.Add(this.labelControl6);
- this.panel1.Controls.Add(this.labelControl7);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.labelControl5);
- this.panel1.Controls.Add(this.labelControl1);
- this.panel1.Controls.Add(this.labelControl12);
- this.panel1.Controls.Add(this.txt_conTel);
- this.panel1.Controls.Add(this.labelControl4);
- this.panel1.Controls.Add(this.txt_conPeople);
- this.panel1.Controls.Add(this.labelControl3);
- this.panel1.Controls.Add(this.txt_name);
- this.panel1.Controls.Add(this.labelControl2);
- this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
- this.panel1.Location = new System.Drawing.Point(415, 16);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(515, 373);
- this.panel1.TabIndex = 3;
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(1072, 584);
+ this.gcMain.TabIndex = 2;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
//
- // labelControl14
+ // gridView1
//
- this.labelControl14.Appearance.ForeColor = System.Drawing.Color.Red;
- this.labelControl14.Appearance.Options.UseForeColor = true;
- this.labelControl14.Location = new System.Drawing.Point(362, 115);
- this.labelControl14.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl14.Name = "labelControl14";
- this.labelControl14.Size = new System.Drawing.Size(8, 18);
- this.labelControl14.TabIndex = 141;
- this.labelControl14.Text = "*";
+ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_operationTime,
+ this.gv_operationTable,
+ this.gv_msg,
+ this.gv_userName});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
//
- // txt_fid
+ // gv_operationTime
//
- this.txt_fid.Location = new System.Drawing.Point(134, 67);
- this.txt_fid.Name = "txt_fid";
- this.txt_fid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fid.Properties.Appearance.Options.UseFont = true;
- this.txt_fid.Size = new System.Drawing.Size(220, 28);
- this.txt_fid.TabIndex = 140;
+ this.gv_operationTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTime.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTime.Caption = "缁勭粐鍚嶇О";
+ this.gv_operationTime.FieldName = "name";
+ this.gv_operationTime.MinWidth = 300;
+ this.gv_operationTime.Name = "gv_operationTime";
+ this.gv_operationTime.OptionsColumn.AllowEdit = false;
+ this.gv_operationTime.Tag = "query_OPERATION_TIME";
+ this.gv_operationTime.Visible = true;
+ this.gv_operationTime.VisibleIndex = 0;
+ this.gv_operationTime.Width = 300;
//
- // labelControl13
+ // gv_operationTable
//
- this.labelControl13.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl13.Appearance.Options.UseFont = true;
- this.labelControl13.Location = new System.Drawing.Point(57, 71);
- this.labelControl13.Name = "labelControl13";
- this.labelControl13.Size = new System.Drawing.Size(69, 21);
- this.labelControl13.TabIndex = 139;
- this.labelControl13.Text = "缁勭粐ID锛�";
+ this.gv_operationTable.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTable.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTable.Caption = "缁勭粐缂栧彿";
+ this.gv_operationTable.FieldName = "fNumber";
+ this.gv_operationTable.MinWidth = 100;
+ this.gv_operationTable.Name = "gv_operationTable";
+ this.gv_operationTable.OptionsColumn.AllowEdit = false;
+ this.gv_operationTable.Tag = "query_OPERATION_TABLE";
+ this.gv_operationTable.Visible = true;
+ this.gv_operationTable.VisibleIndex = 1;
+ this.gv_operationTable.Width = 100;
//
- // txt_isStatus
+ // gv_msg
//
- this.txt_isStatus.AutoSize = true;
- this.txt_isStatus.Checked = true;
- this.txt_isStatus.CheckState = System.Windows.Forms.CheckState.Checked;
- this.txt_isStatus.Location = new System.Drawing.Point(134, 279);
- this.txt_isStatus.Name = "txt_isStatus";
- this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
- this.txt_isStatus.TabIndex = 138;
- this.txt_isStatus.UseVisualStyleBackColor = true;
+ this.gv_msg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_msg.AppearanceCell.Options.UseFont = true;
+ this.gv_msg.Caption = "浣跨敤鐘舵��";
+ this.gv_msg.FieldName = "isStatus";
+ this.gv_msg.MinWidth = 200;
+ this.gv_msg.Name = "gv_msg";
+ this.gv_msg.OptionsColumn.AllowEdit = false;
+ this.gv_msg.Tag = "query_MSG";
+ this.gv_msg.Visible = true;
+ this.gv_msg.VisibleIndex = 2;
+ this.gv_msg.Width = 200;
//
- // labelControl10
+ // gv_userName
//
- this.labelControl10.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl10.Appearance.Options.UseFont = true;
- this.labelControl10.Location = new System.Drawing.Point(362, 70);
- this.labelControl10.Name = "labelControl10";
- this.labelControl10.Size = new System.Drawing.Size(145, 21);
- this.labelControl10.TabIndex = 137;
- this.labelControl10.Text = "锛堟牴缁勭粐缂栧彿涓�1锛�";
- //
- // txt_fNumber
- //
- this.txt_fNumber.Location = new System.Drawing.Point(134, 105);
- this.txt_fNumber.Name = "txt_fNumber";
- this.txt_fNumber.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fNumber.Properties.Appearance.Options.UseFont = true;
- this.txt_fNumber.Size = new System.Drawing.Size(220, 28);
- this.txt_fNumber.TabIndex = 135;
- //
- // labelControl9
- //
- this.labelControl9.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl9.Appearance.Options.UseFont = true;
- this.labelControl9.Location = new System.Drawing.Point(41, 109);
- this.labelControl9.Name = "labelControl9";
- this.labelControl9.Size = new System.Drawing.Size(85, 21);
- this.labelControl9.TabIndex = 134;
- this.labelControl9.Text = "缁勭粐缂栧彿锛�";
- //
- // labelControl11
- //
- this.labelControl11.Location = new System.Drawing.Point(81, 319);
- this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl11.Name = "labelControl11";
- this.labelControl11.Size = new System.Drawing.Size(45, 18);
- this.labelControl11.TabIndex = 133;
- this.labelControl11.Text = "涓婚敭锛�";
- this.labelControl11.Visible = false;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(119, 314);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(0, 21);
- this.label1.TabIndex = 132;
- this.label1.Visible = false;
- //
- // labelControl8
- //
- this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl8.Appearance.Options.UseFont = true;
- this.labelControl8.Location = new System.Drawing.Point(359, 29);
- this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(136, 21);
- this.labelControl8.TabIndex = 120;
- this.labelControl8.Text = "锛堢┖灏嗕负鏍圭粍缁囷級";
- //
- // txt_upGuid
- //
- this.txt_upGuid.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- this.txt_upGuid.FormattingEnabled = true;
- this.txt_upGuid.Location = new System.Drawing.Point(134, 25);
- this.txt_upGuid.Name = "txt_upGuid";
- this.txt_upGuid.Size = new System.Drawing.Size(220, 29);
- this.txt_upGuid.TabIndex = 119;
- //
- // labelControl6
- //
- this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl6.Appearance.Options.UseFont = true;
- this.labelControl6.Location = new System.Drawing.Point(41, 29);
- this.labelControl6.Name = "labelControl6";
- this.labelControl6.Size = new System.Drawing.Size(85, 21);
- this.labelControl6.TabIndex = 118;
- this.labelControl6.Text = "涓婄骇缁勭粐锛�";
- //
- // labelControl7
- //
- this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl7.Appearance.Options.UseFont = true;
- this.labelControl7.Location = new System.Drawing.Point(41, 277);
- this.labelControl7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl7.Name = "labelControl7";
- this.labelControl7.Size = new System.Drawing.Size(85, 21);
- this.labelControl7.TabIndex = 117;
- this.labelControl7.Text = "鏄惁鍚敤锛�";
- //
- // lbGuid
- //
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(134, 324);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 21);
- this.lbGuid.TabIndex = 111;
- this.lbGuid.Visible = false;
- //
- // labelControl5
- //
- this.labelControl5.Appearance.ForeColor = System.Drawing.Color.Red;
- this.labelControl5.Appearance.Options.UseForeColor = true;
- this.labelControl5.Location = new System.Drawing.Point(362, 236);
- this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl5.Name = "labelControl5";
- this.labelControl5.Size = new System.Drawing.Size(8, 18);
- this.labelControl5.TabIndex = 110;
- this.labelControl5.Text = "*";
- //
- // labelControl1
- //
- this.labelControl1.Appearance.ForeColor = System.Drawing.Color.Red;
- this.labelControl1.Appearance.Options.UseForeColor = true;
- this.labelControl1.Location = new System.Drawing.Point(362, 194);
- this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(8, 18);
- this.labelControl1.TabIndex = 109;
- this.labelControl1.Text = "*";
- //
- // labelControl12
- //
- this.labelControl12.Appearance.ForeColor = System.Drawing.Color.Red;
- this.labelControl12.Appearance.Options.UseForeColor = true;
- this.labelControl12.Location = new System.Drawing.Point(362, 152);
- this.labelControl12.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl12.Name = "labelControl12";
- this.labelControl12.Size = new System.Drawing.Size(8, 18);
- this.labelControl12.TabIndex = 108;
- this.labelControl12.Text = "*";
- //
- // txt_conTel
- //
- this.txt_conTel.Location = new System.Drawing.Point(134, 231);
- this.txt_conTel.Name = "txt_conTel";
- this.txt_conTel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_conTel.Properties.Appearance.Options.UseFont = true;
- this.txt_conTel.Size = new System.Drawing.Size(220, 28);
- this.txt_conTel.TabIndex = 7;
- //
- // labelControl4
- //
- this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl4.Appearance.Options.UseFont = true;
- this.labelControl4.Location = new System.Drawing.Point(24, 235);
- this.labelControl4.Name = "labelControl4";
- this.labelControl4.Size = new System.Drawing.Size(102, 21);
- this.labelControl4.TabIndex = 6;
- this.labelControl4.Text = "璐熻矗浜虹數璇濓細";
- //
- // txt_conPeople
- //
- this.txt_conPeople.Location = new System.Drawing.Point(134, 189);
- this.txt_conPeople.Name = "txt_conPeople";
- this.txt_conPeople.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_conPeople.Properties.Appearance.Options.UseFont = true;
- this.txt_conPeople.Size = new System.Drawing.Size(220, 28);
- this.txt_conPeople.TabIndex = 5;
- //
- // labelControl3
- //
- this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl3.Appearance.Options.UseFont = true;
- this.labelControl3.Location = new System.Drawing.Point(24, 193);
- this.labelControl3.Name = "labelControl3";
- this.labelControl3.Size = new System.Drawing.Size(102, 21);
- this.labelControl3.TabIndex = 4;
- this.labelControl3.Text = "缁勭粐璐熻矗浜猴細";
- //
- // txt_name
- //
- this.txt_name.Location = new System.Drawing.Point(134, 147);
- this.txt_name.Name = "txt_name";
- this.txt_name.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_name.Properties.Appearance.Options.UseFont = true;
- this.txt_name.Size = new System.Drawing.Size(220, 28);
- this.txt_name.TabIndex = 3;
- //
- // labelControl2
- //
- this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(41, 151);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(85, 21);
- this.labelControl2.TabIndex = 2;
- this.labelControl2.Text = "缁勭粐鍚嶇О锛�";
- //
- // tlMenu
- //
- this.tlMenu.Dock = System.Windows.Forms.DockStyle.Left;
- this.tlMenu.Font = new System.Drawing.Font("Tahoma", 10F);
- this.tlMenu.Location = new System.Drawing.Point(0, 0);
- this.tlMenu.Name = "tlMenu";
- this.tlMenu.Size = new System.Drawing.Size(388, 584);
- this.tlMenu.TabIndex = 2;
+ this.gv_userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_userName.AppearanceCell.Options.UseFont = true;
+ this.gv_userName.Caption = "鍚屾鏃堕棿";
+ this.gv_userName.FieldName = "edtTime";
+ this.gv_userName.MinWidth = 50;
+ this.gv_userName.Name = "gv_userName";
+ this.gv_userName.OptionsColumn.AllowEdit = false;
+ this.gv_userName.Tag = "query_USER_NAME";
+ this.gv_userName.Visible = true;
+ this.gv_userName.VisibleIndex = 3;
+ this.gv_userName.Width = 250;
//
// Organization
//
@@ -383,13 +173,8 @@
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fid.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fNumber.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_conTel.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_conPeople.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
this.ResumeLayout(false);
}
@@ -398,30 +183,11 @@
private UserControl.UcToolBarMenu toolBarMenu1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private System.Windows.Forms.TreeView tlMenu;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.CheckBox txt_isStatus;
- private DevExpress.XtraEditors.LabelControl labelControl10;
- private DevExpress.XtraEditors.TextEdit txt_fNumber;
- private DevExpress.XtraEditors.LabelControl labelControl9;
- private DevExpress.XtraEditors.LabelControl labelControl11;
- private System.Windows.Forms.Label label1;
- private DevExpress.XtraEditors.LabelControl labelControl8;
- private System.Windows.Forms.ComboBox txt_upGuid;
- private DevExpress.XtraEditors.LabelControl labelControl6;
- private DevExpress.XtraEditors.LabelControl labelControl7;
- private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.LabelControl labelControl5;
- private DevExpress.XtraEditors.LabelControl labelControl1;
- private DevExpress.XtraEditors.LabelControl labelControl12;
- private DevExpress.XtraEditors.TextEdit txt_conTel;
- private DevExpress.XtraEditors.LabelControl labelControl4;
- private DevExpress.XtraEditors.TextEdit txt_conPeople;
- private DevExpress.XtraEditors.LabelControl labelControl3;
- private DevExpress.XtraEditors.TextEdit txt_name;
- private DevExpress.XtraEditors.LabelControl labelControl2;
- private DevExpress.XtraEditors.TextEdit txt_fid;
- private DevExpress.XtraEditors.LabelControl labelControl13;
- private DevExpress.XtraEditors.LabelControl labelControl14;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
index 5f97101..7012fb2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -4,7 +4,6 @@
using System.Windows.Forms;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
-using Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -12,15 +11,14 @@
{
public partial class Organization : XtraForm
{
- List<FilterEntity> _filterList = new List<FilterEntity>();
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
public Organization()
{
-
InitializeComponent();
- this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- tlMenu.DoubleClick += TlMenu_DoubleClick;
- getTree();
+ getPageList(1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
}
/// <summary>
/// 鏌ヨ浜嬩欢
@@ -32,103 +30,45 @@
Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ョ獥浣撲笉鏀寔鏌ヨ锛岃嫢鎯虫洿鏂伴〉闈紝璇风偣鍑� 鍒锋柊");
}
/// <summary>
- /// 鍒锋柊浜嬩欢
+ /// 鍒锋柊浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
- else
- getTree();
+ _filterList.Clear();
+ getPageList(1);
}
- private void TlMenu_DoubleClick(object sender, EventArgs e)
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
{
- var clickedNode = tlMenu.SelectedNode;
- if (clickedNode == null) return;
- if (clickedNode.FirstNode == null)
- {
- var rowGuid = clickedNode.Name;
- getModel(rowGuid, false, 999);
- }
- }
- private void getTree()
- {
- tlMenu.Nodes.Clear();
- var imageList = new ImageList();
- imageList.Images.Add("icon1", Resources.publicfix_32x32);
- imageList.Images.Add("icon2", Resources.user_16x16);
- tlMenu.ImageList = imageList;
- var pgq = new PageQueryModel(1, 999999, "FID");
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage,999999, "FID", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = UtilityHelper.HttpPost("",
- "Organization/GetListPage", json);
+ var strReturn =
+ UtilityHelper.HttpPost("", "Organization/GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = dd.rtnData.list;
- var drGrp = dt.Select("FID=1");
- var dtComList = new DataTable();
- dtComList.Columns.Add("guid", typeof(string));
- dtComList.Columns.Add("name", typeof(string));
- foreach (var _dy in drGrp)
+ if (dd.rtnCode > 0)
{
- dtComList.Rows.Add(_dy["guid"].ToString(),
- _dy["name"].ToString());
- var node = new TreeNode(); //瀹氫箟缁撶偣
- node.Text =
- "(" + _dy["FNumber"] + ")" + _dy["name"]; //涓虹粨鐐硅祴鍊�
- node.Name = _dy["guid"].ToString();
- node.ImageIndex = 0;
- var drItem = dt.Select("FParentlD='" + _dy["FID"] + "'");
- foreach (var _dy2 in drItem)
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ if (dt.Rows.Count > 0)
{
- var node22 = new TreeNode(); //瀹氫箟缁撶偣
- node22.Text =
- "(" + _dy2["FNumber"] + ")" + _dy2["name"]; //涓虹粨鐐硅祴鍊�
- node22.Name = _dy2["guid"].ToString();
- node22.ImageIndex = 1;
- node.Nodes.Add(node22);
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
}
- node.ExpandAll();
- tlMenu.Nodes.Add(node);
- }
- txt_upGuid.DataSource = dtComList;
- txt_upGuid.DisplayMember = "name";
- txt_upGuid.ValueMember = "guid";
- getModel(dtComList.Rows[0]["guid"].ToString(),false,0);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- private void getModel(string strGuid, bool isEdit, int tabIdx)
- {
- if (string.IsNullOrEmpty(strGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- var _obj = new
- {
- guid = strGuid //涓诲缓
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- "Organization/GetModel", JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- var dy = _rtn.rtnData;
- lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit);
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
}
else
{
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
index 955697a..dcfc8fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -88,7 +88,6 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "OPERATION_TIME",
"desc", "", _sbSqlWhere.ToString());
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
index cc9f00a..6fd2172 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -162,7 +162,7 @@
//
// status
//
- this.status.Caption = "鐘舵��";
+ this.status.Caption = "浣跨敤鐘舵��";
this.status.FieldName = "isStatus";
this.status.MinWidth = 25;
this.status.Name = "status";
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index e81cf69..5fcf758 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -63,7 +63,6 @@
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
- this.txt_isStatus = new System.Windows.Forms.CheckBox();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
this.txt_account = new DevExpress.XtraEditors.TextEdit();
@@ -79,11 +78,12 @@
this.tipPwd = new DevExpress.XtraEditors.LabelControl();
this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
this.txt_password = new DevExpress.XtraEditors.TextEdit();
this.lbPwd = new DevExpress.XtraEditors.LabelControl();
this.txt_userName = new DevExpress.XtraEditors.TextEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_isStatus = new System.Windows.Forms.CheckBox();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -112,6 +112,7 @@
this.isLocked.Name = "isLocked";
this.isLocked.OptionsColumn.AllowEdit = false;
this.isLocked.Tag = "query_IS_STATUS";
+ this.isLocked.UnboundDataType = typeof(bool);
this.isLocked.Visible = true;
this.isLocked.VisibleIndex = 7;
this.isLocked.Width = 94;
@@ -406,15 +407,6 @@
this.panel1.Size = new System.Drawing.Size(585, 426);
this.panel1.TabIndex = 1;
//
- // txt_isStatus
- //
- this.txt_isStatus.AutoSize = true;
- this.txt_isStatus.Location = new System.Drawing.Point(125, 342);
- this.txt_isStatus.Name = "txt_isStatus";
- this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
- this.txt_isStatus.TabIndex = 133;
- this.txt_isStatus.UseVisualStyleBackColor = true;
- //
// labelControl11
//
this.labelControl11.Location = new System.Drawing.Point(61, 388);
@@ -573,17 +565,6 @@
this.labelControl6.TabIndex = 103;
this.labelControl6.Text = "閭锛�";
//
- // labelControl5
- //
- this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl5.Appearance.Options.UseFont = true;
- this.labelControl5.Location = new System.Drawing.Point(31, 340);
- this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl5.Name = "labelControl5";
- this.labelControl5.Size = new System.Drawing.Size(85, 21);
- this.labelControl5.TabIndex = 101;
- this.labelControl5.Text = "鍚敤鐘舵�侊細";
- //
// txt_password
//
this.txt_password.Location = new System.Drawing.Point(125, 56);
@@ -625,6 +606,26 @@
this.labelControl2.Size = new System.Drawing.Size(51, 21);
this.labelControl2.TabIndex = 94;
this.labelControl2.Text = "濮撳悕锛�";
+ //
+ // labelControl5
+ //
+ this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl5.Appearance.Options.UseFont = true;
+ this.labelControl5.Location = new System.Drawing.Point(31, 340);
+ this.labelControl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.labelControl5.Name = "labelControl5";
+ this.labelControl5.Size = new System.Drawing.Size(85, 21);
+ this.labelControl5.TabIndex = 101;
+ this.labelControl5.Text = "鍚敤鐘舵�侊細";
+ //
+ // txt_isStatus
+ //
+ this.txt_isStatus.AutoSize = true;
+ this.txt_isStatus.Location = new System.Drawing.Point(125, 342);
+ this.txt_isStatus.Name = "txt_isStatus";
+ this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
+ this.txt_isStatus.TabIndex = 133;
+ this.txt_isStatus.UseVisualStyleBackColor = true;
//
// User
//
@@ -687,7 +688,6 @@
private DevExpress.XtraEditors.LabelControl tipPwd;
private DevExpress.XtraEditors.LabelControl labelControl9;
private DevExpress.XtraEditors.LabelControl labelControl6;
- private DevExpress.XtraEditors.LabelControl labelControl5;
private DevExpress.XtraEditors.TextEdit txt_password;
private DevExpress.XtraEditors.LabelControl lbPwd;
private DevExpress.XtraEditors.TextEdit txt_userName;
@@ -698,7 +698,8 @@
private DevExpress.XtraGrid.Columns.GridColumn account;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
- private System.Windows.Forms.CheckBox txt_isStatus;
private DevExpress.XtraGrid.Columns.GridColumn colCreateBy;
+ private System.Windows.Forms.CheckBox txt_isStatus;
+ private DevExpress.XtraEditors.LabelControl labelControl5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
index 51d2366..7f37d6d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
@@ -60,7 +60,6 @@
this.gvMxRemark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.gv_wwDd = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_shState = new DevExpress.XtraEditors.LabelControl();
this.gv_shState = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_shTime = new DevExpress.XtraEditors.LabelControl();
@@ -442,20 +441,6 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
- // gv_wwDd
- //
- this.gv_wwDd.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_wwDd.AppearanceCell.Options.UseFont = true;
- this.gv_wwDd.Caption = "濮斿璁㈠崟 ";
- this.gv_wwDd.FieldName = "wwDd";
- this.gv_wwDd.MinWidth = 50;
- this.gv_wwDd.Name = "gv_wwDd";
- this.gv_wwDd.OptionsColumn.AllowEdit = false;
- this.gv_wwDd.Tag = "query_a.ww_dd";
- this.gv_wwDd.Visible = true;
- this.gv_wwDd.VisibleIndex = 6;
- this.gv_wwDd.Width = 94;
- //
// lb_shState
//
this.lb_shState.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -493,13 +478,13 @@
//
// txt_shTime
//
- this.txt_shTime.Enabled = false;
this.txt_shTime.Location = new System.Drawing.Point(322, 55);
this.txt_shTime.Name = "txt_shTime";
this.txt_shTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_shTime.Properties.Appearance.Options.UseFont = true;
this.txt_shTime.Size = new System.Drawing.Size(150, 28);
this.txt_shTime.TabIndex = 219;
+ this.txt_shTime.Tag = "readonly";
//
// gv_shTime
//
@@ -527,13 +512,13 @@
//
// txt_shBy
//
- this.txt_shBy.Enabled = false;
this.txt_shBy.Location = new System.Drawing.Point(322, 16);
this.txt_shBy.Name = "txt_shBy";
this.txt_shBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_shBy.Properties.Appearance.Options.UseFont = true;
this.txt_shBy.Size = new System.Drawing.Size(150, 28);
this.txt_shBy.TabIndex = 217;
+ this.txt_shBy.Tag = "readonly";
//
// gv_shBy
//
@@ -589,13 +574,13 @@
//
// txt_hNo
//
- this.txt_hNo.Enabled = false;
this.txt_hNo.Location = new System.Drawing.Point(86, 16);
this.txt_hNo.Name = "txt_hNo";
this.txt_hNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_hNo.Properties.Appearance.Options.UseFont = true;
this.txt_hNo.Size = new System.Drawing.Size(150, 28);
this.txt_hNo.TabIndex = 211;
+ this.txt_hNo.Tag = "readonly";
//
// gv_hNo
//
@@ -651,8 +636,7 @@
this.gv_createBy,
this.gv_createTime,
this.gv_shBy,
- this.gv_shTime,
- this.gv_wwDd});
+ this.gv_shTime});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -846,7 +830,6 @@
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_wwDd;
private DevExpress.XtraEditors.LabelControl lb_shState;
private DevExpress.XtraGrid.Columns.GridColumn gv_shState;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 0d56ad9..6699b5e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- 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();
+ 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.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -67,6 +67,8 @@
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
+ this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
@@ -135,8 +137,6 @@
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
- this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -146,6 +146,8 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
this.panelMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
@@ -174,8 +176,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
this.SuspendLayout();
//
// gvMx2oldqty
@@ -197,12 +197,12 @@
this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
this.gvMx2itemNo.FieldName = "itemNo";
- this.gvMx2itemNo.MinWidth = 50;
+ this.gvMx2itemNo.MinWidth = 100;
this.gvMx2itemNo.Name = "gvMx2itemNo";
this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
this.gvMx2itemNo.Visible = true;
this.gvMx2itemNo.VisibleIndex = 2;
- this.gvMx2itemNo.Width = 94;
+ this.gvMx2itemNo.Width = 100;
//
// gvMx2itemBarcode
//
@@ -210,12 +210,12 @@
this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx2itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx2itemBarcode.FieldName = "itemBarcode";
- this.gvMx2itemBarcode.MinWidth = 50;
+ this.gvMx2itemBarcode.MinWidth = 300;
this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx2itemBarcode.Visible = true;
this.gvMx2itemBarcode.VisibleIndex = 1;
- this.gvMx2itemBarcode.Width = 94;
+ this.gvMx2itemBarcode.Width = 300;
//
// gvMx2guid
//
@@ -280,21 +280,21 @@
//
this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
this.gridColumn18.FieldName = "itemName";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.MinWidth = 150;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 3;
- this.gridColumn18.Width = 94;
+ this.gridColumn18.Width = 150;
//
// gridColumn14
//
this.gridColumn14.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn14.FieldName = "itemModel";
- this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.MinWidth = 150;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 4;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.Width = 150;
//
// gridColumn17
//
@@ -319,10 +319,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
@@ -587,6 +587,34 @@
this.panelMx1.Name = "panelMx1";
this.panelMx1.Size = new System.Drawing.Size(1342, 98);
this.panelMx1.TabIndex = 0;
+ //
+ // txt_iCount_1
+ //
+ this.txt_iCount_1.Location = new System.Drawing.Point(654, 4);
+ this.txt_iCount_1.Name = "txt_iCount_1";
+ this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
+ this.txt_iCount_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
+ this.txt_iCount_1.Properties.MaskSettings.Set("mask", "\\d+");
+ this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
+ this.txt_iCount_1.Size = new System.Drawing.Size(94, 28);
+ this.txt_iCount_1.TabIndex = 264;
+ this.txt_iCount_1.Tag = "ReadOnly";
+ this.txt_iCount_1.ToolTip = "璇疯緭鍏ユ潯鐮佸紶鏁�";
+ //
+ // txt_psnQty_1
+ //
+ this.txt_psnQty_1.Location = new System.Drawing.Point(654, 34);
+ this.txt_psnQty_1.Name = "txt_psnQty_1";
+ this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
+ this.txt_psnQty_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
+ this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+");
+ this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
+ this.txt_psnQty_1.Size = new System.Drawing.Size(94, 28);
+ this.txt_psnQty_1.TabIndex = 263;
+ this.txt_psnQty_1.Tag = "ReadOnly";
+ this.txt_psnQty_1.ToolTip = "璇疯緭鍏ユ瘡寮犳潯鐮佺殑鏁伴噺";
//
// ucBtnPrint1
//
@@ -1337,34 +1365,6 @@
this.txt_billNo.Size = new System.Drawing.Size(215, 28);
this.txt_billNo.TabIndex = 211;
//
- // txt_iCount_1
- //
- this.txt_iCount_1.Location = new System.Drawing.Point(654, 4);
- this.txt_iCount_1.Name = "txt_iCount_1";
- this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
- this.txt_iCount_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
- this.txt_iCount_1.Properties.MaskSettings.Set("mask", "\\d+");
- this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(94, 28);
- this.txt_iCount_1.TabIndex = 264;
- this.txt_iCount_1.Tag = "ReadOnly";
- this.txt_iCount_1.ToolTip = "璇疯緭鍏ユ潯鐮佸紶鏁�";
- //
- // txt_psnQty_1
- //
- this.txt_psnQty_1.Location = new System.Drawing.Point(654, 34);
- this.txt_psnQty_1.Name = "txt_psnQty_1";
- this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
- this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+");
- this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(94, 28);
- this.txt_psnQty_1.TabIndex = 263;
- this.txt_psnQty_1.Tag = "ReadOnly";
- this.txt_psnQty_1.ToolTip = "璇疯緭鍏ユ瘡寮犳潯鐮佺殑鏁伴噺";
- //
// Frm_ArrivalBarcode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1384,6 +1384,8 @@
((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
this.panelMx1.ResumeLayout(false);
this.panelMx1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
@@ -1413,8 +1415,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
index 8d7bc78..7f4cfec 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -42,6 +42,7 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_createDate1 = new DevExpress.XtraEditors.LabelControl();
this.txt_createDate1 = new DevExpress.XtraEditors.TextEdit();
this.lb_itemUnit = new DevExpress.XtraEditors.LabelControl();
@@ -106,14 +107,14 @@
//
this.gvMx1trLotno.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1trLotno.AppearanceCell.Options.UseFont = true;
- this.gvMx1trLotno.Caption = "渚涘簲鍟嗘壒娆�";
- this.gvMx1trLotno.FieldName = "trLotno";
- this.gvMx1trLotno.MinWidth = 50;
+ this.gvMx1trLotno.Caption = "渚涘簲鍟�";
+ this.gvMx1trLotno.FieldName = "suppID";
+ this.gvMx1trLotno.MinWidth = 150;
this.gvMx1trLotno.Name = "gvMx1trLotno";
this.gvMx1trLotno.Tag = "query_a.TR_LOTNO";
this.gvMx1trLotno.Visible = true;
this.gvMx1trLotno.VisibleIndex = 2;
- this.gvMx1trLotno.Width = 94;
+ this.gvMx1trLotno.Width = 150;
//
// gvMx1lotDate
//
@@ -125,7 +126,7 @@
this.gvMx1lotDate.Name = "gvMx1lotDate";
this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
this.gvMx1lotDate.Visible = true;
- this.gvMx1lotDate.VisibleIndex = 5;
+ this.gvMx1lotDate.VisibleIndex = 4;
this.gvMx1lotDate.Width = 94;
//
// gvMx1createBy
@@ -138,7 +139,7 @@
this.gvMx1createBy.Name = "gvMx1createBy";
this.gvMx1createBy.Tag = "query_a.CREATE_BY";
this.gvMx1createBy.Visible = true;
- this.gvMx1createBy.VisibleIndex = 4;
+ this.gvMx1createBy.VisibleIndex = 8;
this.gvMx1createBy.Width = 94;
//
// gvMx1quantity
@@ -217,16 +218,16 @@
this.gvMx1quantity,
this.gvMx1trLotno,
this.gvMx1lotNo,
- this.gvMx1createBy,
this.gvMx1lotDate,
this.gridColumn1,
this.gridColumn2,
- this.gridColumn3});
+ this.gridColumn3,
+ this.gvMx1createBy,
+ this.gridColumn5});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
// gridColumn1
@@ -236,7 +237,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 6;
+ this.gridColumn1.VisibleIndex = 5;
this.gridColumn1.Width = 94;
//
// gridColumn2
@@ -246,7 +247,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 7;
+ this.gridColumn2.VisibleIndex = 6;
this.gridColumn2.Width = 94;
//
// gridColumn3
@@ -256,8 +257,18 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 8;
+ this.gridColumn3.VisibleIndex = 7;
this.gridColumn3.Width = 94;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "寤虹珛鏃ユ湡";
+ this.gridColumn5.FieldName = "createDate";
+ this.gridColumn5.MinWidth = 180;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 9;
+ this.gridColumn5.Width = 180;
//
// lb_createDate1
//
@@ -780,5 +791,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraEditors.TextEdit txt_iCount_1;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index a4afad8..77cf2bd 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -358,7 +358,6 @@
txt.Text = strVal;
}
-
else
txt.Text = strVal;
txt.ReadOnly = isEdt;
@@ -391,7 +390,12 @@
var txt = colType as MemoEdit;
if (txt != null)
txt.Text = strVal;
- txt.ReadOnly = isEdt;
+ if (_isRead(txt.Tag))
+ {
+ txt.ReadOnly = true;
+ }
+ else
+ txt.ReadOnly = isEdt;
continue;
}
//鏁板瓧鍗�
@@ -432,18 +436,32 @@
{
var txt = colType as CheckBox;
if (txt != null)
- txt.Checked = bool.Parse(strVal);
+ switch (strVal)
+ {
+ case "True":
+ txt.Checked = true;
+ break;
+ case "1":
+ txt.Checked = true;
+ break;
+ case "False":
+ txt.Checked = false;
+ break;
+ default:
+ txt.Checked = false;
+ break;
+ }
txt.Enabled = !isEdt;
continue;
}
- if (colType is CheckEdit)
- {
- var txt = colType as CheckEdit;
- if (txt != null)
- txt.Checked = bool.Parse(strVal);
- txt.ReadOnly = isEdt;
- continue;
- }
+ //if (colType is CheckEdit)
+ //{
+ // var txt = colType as CheckEdit;
+ // if (txt != null)
+ // txt.Checked = bool.Parse(strVal);
+ // txt.ReadOnly = isEdt;
+ // continue;
+ //}
//鏃堕棿
if (colType is DateTimePicker)
{
diff --git a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
index ce9d823..02389f2 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
@@ -187,7 +187,7 @@
// gridColumn7
//
this.gridColumn7.Caption = "鍗曚綅";
- this.gridColumn7.FieldName = "unit";
+ this.gridColumn7.FieldName = "dwName";
this.gridColumn7.MinWidth = 100;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
@@ -230,7 +230,7 @@
this.gridColumn10.MinWidth = 125;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 9;
+ this.gridColumn10.VisibleIndex = 8;
this.gridColumn10.Width = 125;
//
// gridColumn2
@@ -240,7 +240,7 @@
this.gridColumn2.MinWidth = 250;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 10;
+ this.gridColumn2.VisibleIndex = 9;
this.gridColumn2.Width = 250;
//
// gridColumn1
--
Gitblit v1.9.3