From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.Designer.cs | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.Designer.cs
index 5c52363..4c96bd5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.Designer.cs
@@ -28,11 +28,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.panelControl2 = new DevExpress.XtraEditors.PanelControl();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -123,7 +123,7 @@
// gridColumn1
//
this.gridColumn1.Caption = "浣跨敤缁勭粐";
- this.gridColumn1.FieldName = "fSubsidiary2";
+ this.gridColumn1.FieldName = "fSubsidiary";
this.gridColumn1.MinWidth = 50;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
@@ -154,6 +154,10 @@
//
// gridColumn3
//
+ this.gridColumn3.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn3.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn3.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn3.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn3.Caption = "搴撳瓨";
this.gridColumn3.FieldName = "kcQty";
this.gridColumn3.MinWidth = 25;
@@ -176,10 +180,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_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);
--
Gitblit v1.9.3