From c7bf48f709dbddd7744c2d005686606bc168a88a Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 25 十月 2025 09:13:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs | 102 +++++++++++++++++++++++++-------------------------
1 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
index 78807c6..e2193bc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
@@ -83,6 +83,8 @@
this.txt_ckNo = new DevExpress.XtraEditors.TextEdit();
this.txt_xsNo = new DevExpress.XtraEditors.TextEdit();
this.txt_custName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fHasLinkTxt = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fHasLinkSource = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -101,6 +103,8 @@
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -128,10 +132,6 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.txt_fHasLinkTxt = new DevExpress.XtraEditors.TextEdit();
- this.txt_fHasLinkSource = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -167,6 +167,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_ckNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_xsNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkTxt.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -185,6 +187,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -194,10 +198,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkTxt.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -374,7 +374,7 @@
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜� ";
- this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.FieldName = "cjPeople";
this.gv_createBy.MinWidth = 50;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
@@ -733,6 +733,22 @@
this.txt_custName.StyleController = this.layoutMx1;
this.txt_custName.TabIndex = 615;
//
+ // txt_fHasLinkTxt
+ //
+ this.txt_fHasLinkTxt.Location = new System.Drawing.Point(1077, 105);
+ this.txt_fHasLinkTxt.Name = "txt_fHasLinkTxt";
+ this.txt_fHasLinkTxt.Size = new System.Drawing.Size(257, 24);
+ this.txt_fHasLinkTxt.StyleController = this.layoutMx1;
+ this.txt_fHasLinkTxt.TabIndex = 616;
+ //
+ // txt_fHasLinkSource
+ //
+ this.txt_fHasLinkSource.Location = new System.Drawing.Point(1077, 136);
+ this.txt_fHasLinkSource.Name = "txt_fHasLinkSource";
+ this.txt_fHasLinkSource.Size = new System.Drawing.Size(257, 24);
+ this.txt_fHasLinkSource.StyleController = this.layoutMx1;
+ this.txt_fHasLinkSource.TabIndex = 617;
+ //
// layoutControlItem19
//
this.layoutControlItem19.Control = this.lbGuid;
@@ -971,6 +987,28 @@
this.layoutControlItem18.Size = new System.Drawing.Size(331, 31);
this.layoutControlItem18.Text = "鏇存柊鏃堕棿";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_fHasLinkSource;
+ this.layoutControlItem13.Location = new System.Drawing.Point(993, 124);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem13.Size = new System.Drawing.Size(333, 32);
+ this.layoutControlItem13.Text = "鏁版嵁鏉ユ簮";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_fHasLinkTxt;
+ this.layoutControlItem10.Location = new System.Drawing.Point(993, 93);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(333, 31);
+ this.layoutControlItem10.Text = "婧愬崟绫诲瀷";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// tabMx
//
@@ -1273,44 +1311,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // txt_fHasLinkTxt
- //
- this.txt_fHasLinkTxt.Location = new System.Drawing.Point(1077, 105);
- this.txt_fHasLinkTxt.Name = "txt_fHasLinkTxt";
- this.txt_fHasLinkTxt.Size = new System.Drawing.Size(257, 24);
- this.txt_fHasLinkTxt.StyleController = this.layoutMx1;
- this.txt_fHasLinkTxt.TabIndex = 616;
- //
- // txt_fHasLinkSource
- //
- this.txt_fHasLinkSource.Location = new System.Drawing.Point(1077, 136);
- this.txt_fHasLinkSource.Name = "txt_fHasLinkSource";
- this.txt_fHasLinkSource.Size = new System.Drawing.Size(257, 24);
- this.txt_fHasLinkSource.StyleController = this.layoutMx1;
- this.txt_fHasLinkSource.TabIndex = 617;
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_fHasLinkSource;
- this.layoutControlItem13.Location = new System.Drawing.Point(993, 124);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(333, 32);
- this.layoutControlItem13.Text = "鏁版嵁鏉ユ簮";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_fHasLinkTxt;
- this.layoutControlItem10.Location = new System.Drawing.Point(993, 93);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(333, 31);
- this.layoutControlItem10.Text = "婧愬崟绫诲瀷";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
// Frm_SalesReturnNoticeDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1356,6 +1356,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_ckNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_xsNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkTxt.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -1374,6 +1376,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1383,10 +1387,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkTxt.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
this.ResumeLayout(false);
}
--
Gitblit v1.9.3