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/UcToolBarMenu.cs | 9 ++++++++-
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 14 +++++++-------
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index 42fa531..6d08680 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -78,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
@@ -89,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});
@@ -381,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
@@ -412,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
@@ -424,7 +424,7 @@
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);
@@ -435,7 +435,7 @@
//
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);
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 0f068f9..b15825a 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -533,7 +533,14 @@
private void BtnHb_ItemClick(object sender, ItemClickEventArgs e)
{
- if (btnHbClick != null) btnHbClick(this, e);
+ //鐐瑰嚮鎸夐挳鏃跺皢鏈鏍告牱寮忔敼涓哄鏍告牱寮�
+ bool bl = _isCk(1);
+ if (bl) return;
+ if (btnChkClick != null)
+ {
+ btnChkClick(this, e);
+ }
+ return;
}
--
Gitblit v1.9.3