From d5e5d25e25799fb798648819fe18a5a429e30beb Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 25 八月 2025 22:25:45 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs | 304 +++++++++++++++++++++++++++++++++++++-----
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs | 65 +++++++++
DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs | 6
3 files changed, 333 insertions(+), 42 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
index f985c23..be85bcf 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
@@ -80,6 +80,16 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions10 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject37 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject38 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject39 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject40 = new DevExpress.Utils.SerializableAppearanceObject();
this.isLocked = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -155,6 +165,22 @@
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptDel3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx4 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit6 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx5 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx5 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit7 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -213,6 +239,14 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptDel3)).BeginInit();
+ this.xtraTabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit6)).BeginInit();
+ this.xtraTabPage4.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit7)).BeginInit();
this.SuspendLayout();
//
// isLocked
@@ -564,7 +598,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1002, 649);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1135, 649);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -584,7 +618,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1002, 649);
+ this.splitMx1.Size = new System.Drawing.Size(1135, 649);
this.splitMx1.SplitterPosition = 140;
this.splitMx1.TabIndex = 0;
//
@@ -607,7 +641,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1002, 140);
+ this.layoutMx1.Size = new System.Drawing.Size(1135, 140);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -623,9 +657,9 @@
// txt_staffId
//
this.txt_staffId.IsReadly = false;
- this.txt_staffId.Location = new System.Drawing.Point(574, 12);
+ this.txt_staffId.Location = new System.Drawing.Point(641, 12);
this.txt_staffId.Name = "txt_staffId";
- this.txt_staffId.Size = new System.Drawing.Size(169, 24);
+ this.txt_staffId.Size = new System.Drawing.Size(203, 24);
this.txt_staffId.TabIndex = 135;
//
// txt_account
@@ -634,7 +668,7 @@
this.txt_account.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_account.Name = "txt_account";
this.txt_account.Properties.Appearance.Options.UseFont = true;
- this.txt_account.Size = new System.Drawing.Size(169, 24);
+ this.txt_account.Size = new System.Drawing.Size(202, 24);
this.txt_account.StyleController = this.layoutMx1;
this.txt_account.TabIndex = 128;
//
@@ -644,18 +678,18 @@
this.txt_password.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_password.Name = "txt_password";
this.txt_password.Properties.Appearance.Options.UseFont = true;
- this.txt_password.Size = new System.Drawing.Size(169, 24);
+ this.txt_password.Size = new System.Drawing.Size(202, 24);
this.txt_password.StyleController = this.layoutMx1;
this.txt_password.TabIndex = 99;
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(329, 72);
+ this.txt_remark.Location = new System.Drawing.Point(362, 72);
this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
this.txt_remark.Properties.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.txt_remark.Size = new System.Drawing.Size(169, 26);
+ this.txt_remark.Size = new System.Drawing.Size(203, 26);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 126;
//
@@ -665,7 +699,7 @@
this.txt_userName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_userName.Name = "txt_userName";
this.txt_userName.Properties.Appearance.Options.UseFont = true;
- this.txt_userName.Size = new System.Drawing.Size(169, 24);
+ this.txt_userName.Size = new System.Drawing.Size(202, 24);
this.txt_userName.StyleController = this.layoutMx1;
this.txt_userName.TabIndex = 95;
//
@@ -675,36 +709,36 @@
this.txt_email.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_email.Name = "txt_email";
this.txt_email.Properties.Appearance.Options.UseFont = true;
- this.txt_email.Size = new System.Drawing.Size(169, 24);
+ this.txt_email.Size = new System.Drawing.Size(202, 24);
this.txt_email.StyleController = this.layoutMx1;
this.txt_email.TabIndex = 120;
//
// txt_address
//
- this.txt_address.Location = new System.Drawing.Point(329, 42);
+ this.txt_address.Location = new System.Drawing.Point(362, 42);
this.txt_address.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_address.Name = "txt_address";
this.txt_address.Properties.Appearance.Options.UseFont = true;
- this.txt_address.Size = new System.Drawing.Size(169, 24);
+ this.txt_address.Size = new System.Drawing.Size(203, 24);
this.txt_address.StyleController = this.layoutMx1;
this.txt_address.TabIndex = 124;
//
// txt_tel
//
- this.txt_tel.Location = new System.Drawing.Point(329, 12);
+ this.txt_tel.Location = new System.Drawing.Point(362, 12);
this.txt_tel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_tel.Name = "txt_tel";
this.txt_tel.Properties.Appearance.Options.UseFont = true;
- this.txt_tel.Size = new System.Drawing.Size(169, 24);
+ this.txt_tel.Size = new System.Drawing.Size(203, 24);
this.txt_tel.StyleController = this.layoutMx1;
this.txt_tel.TabIndex = 122;
//
// txt_isStatus
//
- this.txt_isStatus.Location = new System.Drawing.Point(257, 102);
+ this.txt_isStatus.Location = new System.Drawing.Point(290, 102);
this.txt_isStatus.Name = "txt_isStatus";
this.txt_isStatus.Properties.Caption = "鍚敤鐘舵��";
- this.txt_isStatus.Size = new System.Drawing.Size(241, 24);
+ this.txt_isStatus.Size = new System.Drawing.Size(275, 24);
this.txt_isStatus.StyleController = this.layoutMx1;
this.txt_isStatus.TabIndex = 129;
//
@@ -762,7 +796,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1002, 140);
+ this.Root.Size = new System.Drawing.Size(1135, 140);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -770,7 +804,7 @@
this.layoutControlItem1.Control = this.txt_account;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(245, 30);
+ this.layoutControlItem1.Size = new System.Drawing.Size(278, 30);
this.layoutControlItem1.Text = "鐧诲綍璐﹀彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -780,7 +814,7 @@
this.layoutControlItem2.Location = new System.Drawing.Point(0, 30);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(245, 30);
+ this.layoutControlItem2.Size = new System.Drawing.Size(278, 30);
this.layoutControlItem2.Text = "鍒濆瀵嗙爜";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -790,7 +824,7 @@
this.layoutControlItem3.Location = new System.Drawing.Point(0, 60);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(245, 30);
+ this.layoutControlItem3.Size = new System.Drawing.Size(278, 30);
this.layoutControlItem3.Text = "璐﹀彿鍚嶇О";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
@@ -800,50 +834,50 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 90);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(245, 30);
+ this.layoutControlItem4.Size = new System.Drawing.Size(278, 30);
this.layoutControlItem4.Text = "閭";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_tel;
- this.layoutControlItem5.Location = new System.Drawing.Point(245, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(278, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(245, 30);
+ this.layoutControlItem5.Size = new System.Drawing.Size(279, 30);
this.layoutControlItem5.Text = "鐢佃瘽";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_address;
- this.layoutControlItem6.Location = new System.Drawing.Point(245, 30);
+ this.layoutControlItem6.Location = new System.Drawing.Point(278, 30);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(245, 30);
+ this.layoutControlItem6.Size = new System.Drawing.Size(279, 30);
this.layoutControlItem6.Text = "浣忓鍦板潃";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_remark;
- this.layoutControlItem7.Location = new System.Drawing.Point(245, 60);
+ this.layoutControlItem7.Location = new System.Drawing.Point(278, 60);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(245, 30);
+ this.layoutControlItem7.Size = new System.Drawing.Size(279, 30);
this.layoutControlItem7.Text = "澶囨敞";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_isStatus;
- this.layoutControlItem8.Location = new System.Drawing.Point(245, 90);
+ this.layoutControlItem8.Location = new System.Drawing.Point(278, 90);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(245, 30);
+ this.layoutControlItem8.Size = new System.Drawing.Size(279, 30);
this.layoutControlItem8.Text = "鍚敤鐘舵��";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -851,10 +885,10 @@
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_staffId;
- this.layoutControlItem9.Location = new System.Drawing.Point(490, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(557, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(245, 30);
+ this.layoutControlItem9.Size = new System.Drawing.Size(279, 30);
this.layoutControlItem9.Text = "鍏宠仈鍛樺伐";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
@@ -864,18 +898,20 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1002, 497);
+ this.tabMx.Size = new System.Drawing.Size(1135, 497);
this.tabMx.TabIndex = 5;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
this.tabMxPage2,
- this.tabMxPage3});
+ this.tabMxPage3,
+ this.xtraTabPage3,
+ this.xtraTabPage4});
//
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1000, 465);
+ this.tabMxPage1.Size = new System.Drawing.Size(1133, 465);
this.tabMxPage1.Text = "PDA椤甸潰";
//
// gcMx1
@@ -886,7 +922,7 @@
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.rptDel1});
- this.gcMx1.Size = new System.Drawing.Size(1000, 465);
+ this.gcMx1.Size = new System.Drawing.Size(1133, 465);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -957,7 +993,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1000, 465);
+ this.tabMxPage2.Size = new System.Drawing.Size(1133, 465);
this.tabMxPage2.Text = "浠撳簱";
//
// gcMx2
@@ -968,7 +1004,7 @@
this.gcMx2.Name = "gcMx2";
this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.rptDel2});
- this.gcMx2.Size = new System.Drawing.Size(1000, 465);
+ this.gcMx2.Size = new System.Drawing.Size(1133, 465);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1041,7 +1077,7 @@
//
this.tabMxPage3.Controls.Add(this.gcMx3);
this.tabMxPage3.Name = "tabMxPage3";
- this.tabMxPage3.Size = new System.Drawing.Size(1000, 465);
+ this.tabMxPage3.Size = new System.Drawing.Size(1133, 465);
this.tabMxPage3.Text = "鎵撳嵃鏈�";
//
// gcMx3
@@ -1052,7 +1088,7 @@
this.gcMx3.Name = "gcMx3";
this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.rptDel3});
- this.gcMx3.Size = new System.Drawing.Size(1000, 465);
+ this.gcMx3.Size = new System.Drawing.Size(1133, 465);
this.gcMx3.TabIndex = 1;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -1118,6 +1154,170 @@
this.rptDel3.Name = "rptDel3";
this.rptDel3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptDel3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDel3_ButtonClick);
+ //
+ // xtraTabPage3
+ //
+ this.xtraTabPage3.Controls.Add(this.gcMx4);
+ this.xtraTabPage3.Name = "xtraTabPage3";
+ this.xtraTabPage3.Size = new System.Drawing.Size(1133, 465);
+ this.xtraTabPage3.Text = "绾夸綋";
+ //
+ // gcMx4
+ //
+ this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx4.Location = new System.Drawing.Point(0, 0);
+ this.gcMx4.MainView = this.gvMx4;
+ this.gcMx4.Name = "gcMx4";
+ this.gcMx4.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit6});
+ this.gcMx4.Size = new System.Drawing.Size(1133, 465);
+ this.gcMx4.TabIndex = 2;
+ this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx4});
+ //
+ // gvMx4
+ //
+ this.gvMx4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn17,
+ this.gridColumn18,
+ this.gridColumn19,
+ this.gridColumn20});
+ this.gvMx4.GridControl = this.gcMx4;
+ this.gvMx4.Name = "gvMx4";
+ this.gvMx4.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx4.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx4.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "gridColumn1";
+ this.gridColumn17.FieldName = "guid";
+ this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Width = 94;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.Caption = "绾夸綋鍚嶇О";
+ this.gridColumn18.FieldName = "gnName";
+ this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 0;
+ this.gridColumn18.Width = 94;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.Caption = "缁戝畾绫诲瀷";
+ this.gridColumn19.FieldName = "fType";
+ this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 1;
+ this.gridColumn19.Width = 94;
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "绉诲嚭";
+ this.gridColumn20.ColumnEdit = this.repositoryItemButtonEdit6;
+ this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 2;
+ this.gridColumn20.Width = 94;
+ //
+ // repositoryItemButtonEdit6
+ //
+ this.repositoryItemButtonEdit6.AutoHeight = false;
+ editorButtonImageOptions9.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions9.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit6.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit6.Name = "repositoryItemButtonEdit6";
+ this.repositoryItemButtonEdit6.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit6.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit6_ButtonClick);
+ //
+ // xtraTabPage4
+ //
+ this.xtraTabPage4.Controls.Add(this.gcMx5);
+ this.xtraTabPage4.Name = "xtraTabPage4";
+ this.xtraTabPage4.Size = new System.Drawing.Size(1133, 465);
+ this.xtraTabPage4.Text = "缁勭粐";
+ //
+ // gcMx5
+ //
+ this.gcMx5.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx5.Location = new System.Drawing.Point(0, 0);
+ this.gcMx5.MainView = this.gvMx5;
+ this.gcMx5.Name = "gcMx5";
+ this.gcMx5.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit7});
+ this.gcMx5.Size = new System.Drawing.Size(1133, 465);
+ this.gcMx5.TabIndex = 3;
+ this.gcMx5.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx5});
+ //
+ // gvMx5
+ //
+ this.gvMx5.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn21,
+ this.gridColumn22,
+ this.gridColumn23,
+ this.gridColumn24});
+ this.gvMx5.GridControl = this.gcMx5;
+ this.gvMx5.Name = "gvMx5";
+ this.gvMx5.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx5.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx5.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "gridColumn1";
+ this.gridColumn21.FieldName = "guid";
+ this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Width = 94;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.Caption = "缁勭粐鍚嶇О";
+ this.gridColumn22.FieldName = "gnName";
+ this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 0;
+ this.gridColumn22.Width = 94;
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "缁戝畾绫诲瀷";
+ this.gridColumn23.FieldName = "fType";
+ this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 1;
+ this.gridColumn23.Width = 94;
+ //
+ // gridColumn24
+ //
+ this.gridColumn24.Caption = "绉诲嚭";
+ this.gridColumn24.ColumnEdit = this.repositoryItemButtonEdit7;
+ this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.Visible = true;
+ this.gridColumn24.VisibleIndex = 2;
+ this.gridColumn24.Width = 94;
+ //
+ // repositoryItemButtonEdit7
+ //
+ this.repositoryItemButtonEdit7.AutoHeight = false;
+ editorButtonImageOptions10.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions10.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit7.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit7.Name = "repositoryItemButtonEdit7";
+ this.repositoryItemButtonEdit7.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit7.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit7_ButtonClick);
//
// Frm_UserBind
//
@@ -1185,6 +1385,14 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptDel3)).EndInit();
+ this.xtraTabPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit6)).EndInit();
+ this.xtraTabPage4.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit7)).EndInit();
this.ResumeLayout(false);
}
@@ -1267,5 +1475,21 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit5;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage4;
+ private DevExpress.XtraGrid.GridControl gcMx4;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit6;
+ private DevExpress.XtraGrid.GridControl gcMx5;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit7;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
index 976a866..28f11f2 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
@@ -24,6 +24,8 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx4);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx5);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -182,6 +184,8 @@
gvList.Add(gvMx1);
gvList.Add(gvMx2);
gvList.Add(gvMx3);
+ gvList.Add(gvMx4);
+ gvList.Add(gvMx5);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
@@ -226,7 +230,7 @@
array3.Add(a);
}
DataTable dt3 = JsonConvert.DeserializeObject<DataTable>(array3.ToString());
- if (dt2.Rows.Count > 0)
+ if (dt3.Rows.Count > 0)
{
gcMx3.BindingContext = new BindingContext();
gcMx3.DataSource = dt3;
@@ -237,6 +241,44 @@
else
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
+ }
+
+ JArray array4 = new JArray();
+ foreach (var a in _job["rtnData"]["list4"])
+ {
+ array4.Add(a);
+ }
+ DataTable dt4 = JsonConvert.DeserializeObject<DataTable>(array4.ToString());
+ if (dt4.Rows.Count > 0)
+ {
+ gcMx4.BindingContext = new BindingContext();
+ gcMx4.DataSource = dt4;
+ gcMx4.ForceInitialize();
+ gvMx4.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx4);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx4, gvMx4);
+ }
+
+ JArray array5= new JArray();
+ foreach (var a in _job["rtnData"]["list5"])
+ {
+ array5.Add(a);
+ }
+ DataTable dt5 = JsonConvert.DeserializeObject<DataTable>(array5.ToString());
+ if (dt5.Rows.Count > 0)
+ {
+ gcMx5.BindingContext = new BindingContext();
+ gcMx5.DataSource = dt5;
+ gcMx5.ForceInitialize();
+ gvMx5.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx5);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx5, gvMx5);
}
}
else
@@ -366,6 +408,25 @@
delBind(e, gvMx3);
}
/// <summary>
+ /// 鍒犻櫎绾夸綋
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit6_ButtonClick(object sender, ButtonPressedEventArgs e)
+ {
+ delBind(e, gvMx4);
+ }
+ /// <summary>
+ /// 鍒犻櫎缁勭粐
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit7_ButtonClick(object sender, ButtonPressedEventArgs e)
+ {
+ delBind(e, gvMx5);
+ }
+
+ /// <summary>
/// 鍒犻櫎鍚勭缁戝畾
/// </summary>
/// <param name="e"></param>
@@ -406,7 +467,9 @@
}
}
+
#endregion
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
index e7f4fa1..cdcf2f0 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
@@ -56,7 +56,11 @@
private void getPageList(int curPage)
{
gcMain.DataSource = null;
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and org.fid in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), strType);
var json = JsonConvert.SerializeObject(pgq);
try
--
Gitblit v1.9.3