From 72ff599e2cacd5c232df18bf75304b0fa0a2d65b Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期一, 11 八月 2025 16:04:24 +0800
Subject: [PATCH] 1、采购合并提交按钮优化 ：保存后按钮不可编辑、点击合并后已审核样式没有更新
---
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 123 ++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 43 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index 6fb1378..6d08680 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -49,12 +49,15 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_demandDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_sourceDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_remainingReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
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();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
this.panelControl2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -75,7 +78,7 @@
this.panelControl2.Location = new System.Drawing.Point(0, 0);
this.panelControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panelControl2.Name = "panelControl2";
- this.panelControl2.Size = new System.Drawing.Size(987, 530);
+ this.panelControl2.Size = new System.Drawing.Size(1494, 612);
this.panelControl2.TabIndex = 4;
//
// gcMain
@@ -86,7 +89,7 @@
this.gcMain.MainView = this.gridView1;
this.gcMain.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(983, 463);
+ this.gcMain.Size = new System.Drawing.Size(1490, 545);
this.gcMain.TabIndex = 2;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -115,7 +118,10 @@
this.gridColumn2,
this.gridColumn4,
this.gridColumn1,
- this.gridColumn8});
+ this.gridColumn8,
+ this.gv_demandDocumentId,
+ this.gv_sourceDocumentId,
+ this.gv_remainingReceivedQty});
this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 44;
@@ -183,8 +189,8 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 2;
- this.gridColumn3.Width = 10;
+ this.gridColumn3.VisibleIndex = 17;
+ this.gridColumn3.Width = 40;
//
// gv_supplierItemCode
//
@@ -197,8 +203,8 @@
this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
this.gv_supplierItemCode.Visible = true;
- this.gv_supplierItemCode.VisibleIndex = 3;
- this.gv_supplierItemCode.Width = 10;
+ this.gv_supplierItemCode.VisibleIndex = 4;
+ this.gv_supplierItemCode.Width = 13;
//
// gv_supplierItemName
//
@@ -211,8 +217,8 @@
this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
this.gv_supplierItemName.Visible = true;
- this.gv_supplierItemName.VisibleIndex = 4;
- this.gv_supplierItemName.Width = 10;
+ this.gv_supplierItemName.VisibleIndex = 5;
+ this.gv_supplierItemName.Width = 13;
//
// gridColumn6
//
@@ -222,8 +228,8 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 5;
- this.gridColumn6.Width = 10;
+ this.gridColumn6.VisibleIndex = 7;
+ this.gridColumn6.Width = 45;
//
// gridColumn9
//
@@ -233,8 +239,8 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 6;
- this.gridColumn9.Width = 44;
+ this.gridColumn9.VisibleIndex = 8;
+ this.gridColumn9.Width = 17;
//
// gridColumn7
//
@@ -248,8 +254,8 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 7;
- this.gridColumn7.Width = 10;
+ this.gridColumn7.VisibleIndex = 6;
+ this.gridColumn7.Width = 11;
//
// gv_purchaseUnit
//
@@ -262,8 +268,8 @@
this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gv_purchaseUnit.Visible = true;
- this.gv_purchaseUnit.VisibleIndex = 8;
- this.gv_purchaseUnit.Width = 44;
+ this.gv_purchaseUnit.VisibleIndex = 11;
+ this.gv_purchaseUnit.Width = 72;
//
// gv_remarks
//
@@ -276,8 +282,8 @@
this.gv_remarks.OptionsColumn.ReadOnly = true;
this.gv_remarks.Tag = "query_a.REMARKS";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 9;
- this.gv_remarks.Width = 10;
+ this.gv_remarks.VisibleIndex = 12;
+ this.gv_remarks.Width = 12;
//
// gridColumn5
//
@@ -287,8 +293,8 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 10;
- this.gridColumn5.Width = 10;
+ this.gridColumn5.VisibleIndex = 13;
+ this.gridColumn5.Width = 12;
//
// gridColumn10
//
@@ -297,8 +303,8 @@
this.gridColumn10.MinWidth = 10;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 11;
- this.gridColumn10.Width = 109;
+ this.gridColumn10.VisibleIndex = 14;
+ this.gridColumn10.Width = 45;
//
// gridColumn2
//
@@ -307,8 +313,8 @@
this.gridColumn2.MinWidth = 10;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 12;
- this.gridColumn2.Width = 10;
+ this.gridColumn2.VisibleIndex = 15;
+ this.gridColumn2.Width = 20;
//
// gridColumn4
//
@@ -318,8 +324,8 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 13;
- this.gridColumn4.Width = 105;
+ this.gridColumn4.VisibleIndex = 18;
+ this.gridColumn4.Width = 285;
//
// gridColumn1
//
@@ -328,8 +334,44 @@
this.gridColumn1.MinWidth = 10;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 14;
- this.gridColumn1.Width = 22;
+ this.gridColumn1.VisibleIndex = 16;
+ this.gridColumn1.Width = 54;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鏈鏀堕噺";
+ this.gridColumn8.FieldName = "bcsl";
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 10;
+ this.gridColumn8.Width = 72;
+ //
+ // gv_demandDocumentId
+ //
+ this.gv_demandDocumentId.Caption = "闇�姹傚崟鎹彿";
+ this.gv_demandDocumentId.FieldName = "demandDocumentId";
+ this.gv_demandDocumentId.Name = "gv_demandDocumentId";
+ this.gv_demandDocumentId.Visible = true;
+ this.gv_demandDocumentId.VisibleIndex = 2;
+ this.gv_demandDocumentId.Width = 38;
+ //
+ // gv_sourceDocumentId
+ //
+ this.gv_sourceDocumentId.Caption = "婧愬崟鍗曞彿";
+ this.gv_sourceDocumentId.FieldName = "sourceDocumentId";
+ this.gv_sourceDocumentId.Name = "gv_sourceDocumentId";
+ this.gv_sourceDocumentId.Visible = true;
+ this.gv_sourceDocumentId.VisibleIndex = 3;
+ this.gv_sourceDocumentId.Width = 32;
+ //
+ // gv_remainingReceivedQty
+ //
+ this.gv_remainingReceivedQty.Caption = "ERP鍓╀綑鏈敹鏁伴噺";
+ this.gv_remainingReceivedQty.FieldName = "remainingReceivedQty";
+ this.gv_remainingReceivedQty.Name = "gv_remainingReceivedQty";
+ this.gv_remainingReceivedQty.Visible = true;
+ this.gv_remainingReceivedQty.VisibleIndex = 9;
+ this.gv_remainingReceivedQty.Width = 62;
//
// panelControl3
//
@@ -339,7 +381,7 @@
this.panelControl3.Location = new System.Drawing.Point(2, 2);
this.panelControl3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panelControl3.Name = "panelControl3";
- this.panelControl3.Size = new System.Drawing.Size(983, 30);
+ this.panelControl3.Size = new System.Drawing.Size(1490, 30);
this.panelControl3.TabIndex = 6;
//
// label1
@@ -370,10 +412,10 @@
//
this.panelControl1.Controls.Add(this.btnIn);
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panelControl1.Location = new System.Drawing.Point(2, 495);
+ this.panelControl1.Location = new System.Drawing.Point(2, 577);
this.panelControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(983, 33);
+ this.panelControl1.Size = new System.Drawing.Size(1490, 33);
this.panelControl1.TabIndex = 5;
//
// btnIn
@@ -382,26 +424,18 @@
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(899, 2);
+ this.btnIn.Location = new System.Drawing.Point(1406, 2);
this.btnIn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnIn.Name = "btnIn";
this.btnIn.Size = new System.Drawing.Size(82, 29);
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾瀵煎叆";
//
- // gridColumn8
- //
- this.gridColumn8.Caption = "鏈鏀堕噺";
- this.gridColumn8.FieldName = "bcsl";
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 15;
- //
// SelectCgMx
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(987, 530);
+ this.ClientSize = new System.Drawing.Size(1494, 612);
this.Controls.Add(this.panelControl2);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -451,5 +485,8 @@
private System.Windows.Forms.Label label1;
private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_demandDocumentId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_sourceDocumentId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_remainingReceivedQty;
}
}
\ No newline at end of file
--
Gitblit v1.9.3