From 0dcc33644c822962063832bfc5cd4d28118de781 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 26 六月 2025 17:01:56 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs |  214 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 183 insertions(+), 31 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index e4516bf..7352f38 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -29,7 +29,14 @@
         /// </summary>
         private void InitializeComponent()
         {
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
             this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -49,40 +56,74 @@
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.gridControl2 = new DevExpress.XtraGrid.GridControl();
+            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.rptSrm = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
             this.label1 = new System.Windows.Forms.Label();
             this.radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
-            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
-            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
             ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
             this.panelControl2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+            this.panelControl1.SuspendLayout();
+            this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptSrm)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit();
             this.panelControl3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
-            this.panelControl1.SuspendLayout();
             this.SuspendLayout();
             // 
             // panelControl2
             // 
-            this.panelControl2.Controls.Add(this.gcMain);
+            this.panelControl2.Controls.Add(this.xtraTabControl1);
             this.panelControl2.Controls.Add(this.panelControl3);
-            this.panelControl2.Controls.Add(this.panelControl1);
             this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelControl2.Location = new System.Drawing.Point(0, 0);
             this.panelControl2.Name = "panelControl2";
             this.panelControl2.Size = new System.Drawing.Size(1128, 682);
             this.panelControl2.TabIndex = 4;
             // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(2, 40);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1124, 640);
+            this.xtraTabControl1.TabIndex = 7;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2});
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.gcMain);
+            this.xtraTabPage1.Controls.Add(this.panelControl1);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1122, 608);
+            this.xtraTabPage1.Text = "鏅�氬埌璐у崟";
+            // 
             // gcMain
             // 
             this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain.Location = new System.Drawing.Point(2, 40);
+            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(1124, 597);
+            this.gcMain.Size = new System.Drawing.Size(1122, 565);
             this.gcMain.TabIndex = 2;
             this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -325,6 +366,121 @@
             this.gridColumn1.VisibleIndex = 14;
             this.gridColumn1.Width = 25;
             // 
+            // panelControl1
+            // 
+            this.panelControl1.Controls.Add(this.btnIn);
+            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panelControl1.Location = new System.Drawing.Point(0, 565);
+            this.panelControl1.Name = "panelControl1";
+            this.panelControl1.Size = new System.Drawing.Size(1122, 43);
+            this.panelControl1.TabIndex = 5;
+            // 
+            // btnIn
+            // 
+            this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+            this.btnIn.Appearance.Options.UseBackColor = true;
+            this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
+            this.btnIn.Location = new System.Drawing.Point(1026, 2);
+            this.btnIn.Name = "btnIn";
+            this.btnIn.Size = new System.Drawing.Size(94, 39);
+            this.btnIn.TabIndex = 4;
+            this.btnIn.Text = "纭畾瀵煎叆";
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.gridControl2);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1122, 608);
+            this.xtraTabPage2.Text = "SRM鍒拌揣鍗�";
+            // 
+            // gridControl2
+            // 
+            this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gridControl2.Location = new System.Drawing.Point(0, 0);
+            this.gridControl2.MainView = this.gridView2;
+            this.gridControl2.Name = "gridControl2";
+            this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.rptSrm});
+            this.gridControl2.Size = new System.Drawing.Size(1122, 608);
+            this.gridControl2.TabIndex = 4;
+            this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView2});
+            // 
+            // gridView2
+            // 
+            this.gridView2.Appearance.Row.Options.UseFont = true;
+            this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gv_operationTime,
+            this.gv_operationTable,
+            this.gv_userName,
+            this.gv_Btn});
+            this.gridView2.GridControl = this.gridControl2;
+            this.gridView2.Name = "gridView2";
+            this.gridView2.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView2.OptionsView.ShowAutoFilterRow = true;
+            this.gridView2.OptionsView.ShowGroupPanel = false;
+            // 
+            // gv_operationTime
+            // 
+            this.gv_operationTime.AppearanceCell.Options.UseFont = true;
+            this.gv_operationTime.Caption = "鏀舵枡缁勭粐";
+            this.gv_operationTime.FieldName = "orgName";
+            this.gv_operationTime.MinWidth = 10;
+            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;
+            // 
+            // gv_operationTable
+            // 
+            this.gv_operationTable.AppearanceCell.Options.UseFont = true;
+            this.gv_operationTable.Caption = "閫佽揣渚涘簲鍟�";
+            this.gv_operationTable.FieldName = "suppName";
+            this.gv_operationTable.MinWidth = 10;
+            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;
+            // 
+            // gv_userName
+            // 
+            this.gv_userName.AppearanceCell.Options.UseFont = true;
+            this.gv_userName.Caption = "閫佽揣鍗曞彿";
+            this.gv_userName.FieldName = "deliveryNo";
+            this.gv_userName.MinWidth = 10;
+            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 = 2;
+            this.gv_userName.Width = 250;
+            // 
+            // gv_Btn
+            // 
+            this.gv_Btn.Caption = "閫夋嫨";
+            this.gv_Btn.ColumnEdit = this.rptSrm;
+            this.gv_Btn.MinWidth = 25;
+            this.gv_Btn.Name = "gv_Btn";
+            this.gv_Btn.Visible = true;
+            this.gv_Btn.VisibleIndex = 3;
+            this.gv_Btn.Width = 94;
+            // 
+            // rptSrm
+            // 
+            this.rptSrm.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.rptSrm.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.rptSrm.Name = "rptSrm";
+            this.rptSrm.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.rptSrm.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptSrm_ButtonClick);
+            // 
             // panelControl3
             // 
             this.panelControl3.Controls.Add(this.label1);
@@ -355,27 +511,6 @@
             this.radioGroup1.Size = new System.Drawing.Size(197, 34);
             this.radioGroup1.TabIndex = 0;
             // 
-            // panelControl1
-            // 
-            this.panelControl1.Controls.Add(this.btnIn);
-            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panelControl1.Location = new System.Drawing.Point(2, 637);
-            this.panelControl1.Name = "panelControl1";
-            this.panelControl1.Size = new System.Drawing.Size(1124, 43);
-            this.panelControl1.TabIndex = 5;
-            // 
-            // btnIn
-            // 
-            this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
-            this.btnIn.Appearance.Options.UseBackColor = true;
-            this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
-            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
-            this.btnIn.Location = new System.Drawing.Point(1028, 2);
-            this.btnIn.Name = "btnIn";
-            this.btnIn.Size = new System.Drawing.Size(94, 39);
-            this.btnIn.TabIndex = 4;
-            this.btnIn.Text = "纭畾瀵煎叆";
-            // 
             // SelectCgMx
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -391,14 +526,21 @@
             this.TopMost = true;
             ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
             this.panelControl2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.xtraTabPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+            this.panelControl1.ResumeLayout(false);
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptSrm)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).EndInit();
             this.panelControl3.ResumeLayout(false);
             this.panelControl3.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
-            this.panelControl1.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
@@ -428,5 +570,15 @@
         private DevExpress.XtraEditors.SimpleButton btnIn;
         private System.Windows.Forms.Label label1;
         private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private DevExpress.XtraGrid.GridControl gridControl2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+        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_Btn;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptSrm;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3