From bc3adbd73a55d8382fbd02b2fd090a05ec13a7d5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 13 三月 2025 10:07:17 +0800
Subject: [PATCH] 提交OA
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 20 +++++
DevApp/Gs.DevApp/Resources/meeting_16x16.png | 0
DevApp/Gs.DevApp/Resources/meeting_32x321.png | 0
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 21 ++++-
DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs | 4
DevApp/Gs.DevApp/Gs.DevApp.csproj | 2
DevApp/Gs.DevApp/Properties/Resources.resx | 30 ++++---
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs | 57 +++++++++++++-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 100 ++++++++++++------------
9 files changed, 160 insertions(+), 74 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 6a6406b..7d0197a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -590,23 +590,23 @@
//
// txtDepotsCode
//
- this.txtDepotsCode.Location = new System.Drawing.Point(411, 76);
+ this.txtDepotsCode.Location = new System.Drawing.Point(416, 76);
this.txtDepotsCode.Name = "txtDepotsCode";
this.txtDepotsCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtDepotsCode.Properties.Appearance.Options.UseFont = true;
this.txtDepotsCode.Properties.Tag = "";
- this.txtDepotsCode.Size = new System.Drawing.Size(191, 28);
+ this.txtDepotsCode.Size = new System.Drawing.Size(197, 28);
this.txtDepotsCode.StyleController = this.layoutMx1;
this.txtDepotsCode.TabIndex = 454;
this.txtDepotsCode.Tag = "readOnly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(411, 108);
+ this.txt_remark.Location = new System.Drawing.Point(416, 108);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(488, 28);
+ this.txt_remark.Size = new System.Drawing.Size(500, 28);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 240;
//
@@ -615,17 +615,17 @@
this.txt_receiveOrgId.IsReadly = false;
this.txt_receiveOrgId.Location = new System.Drawing.Point(114, 44);
this.txt_receiveOrgId.Name = "txt_receiveOrgId";
- this.txt_receiveOrgId.Size = new System.Drawing.Size(191, 28);
+ this.txt_receiveOrgId.Size = new System.Drawing.Size(196, 28);
this.txt_receiveOrgId.TabIndex = 457;
//
// txtSupplierCode
//
- this.txtSupplierCode.Location = new System.Drawing.Point(411, 44);
+ this.txtSupplierCode.Location = new System.Drawing.Point(416, 44);
this.txtSupplierCode.Name = "txtSupplierCode";
this.txtSupplierCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
this.txtSupplierCode.Properties.Tag = "";
- this.txtSupplierCode.Size = new System.Drawing.Size(191, 28);
+ this.txtSupplierCode.Size = new System.Drawing.Size(197, 28);
this.txtSupplierCode.StyleController = this.layoutMx1;
this.txtSupplierCode.TabIndex = 451;
this.txtSupplierCode.Tag = "readOnly";
@@ -637,7 +637,7 @@
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
this.txt_billNo.Properties.Tag = "";
- this.txt_billNo.Size = new System.Drawing.Size(191, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(196, 28);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readOnly";
@@ -648,7 +648,7 @@
this.txt_depotsId.Location = new System.Drawing.Point(114, 108);
this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
this.txt_depotsId.Name = "txt_depotsId";
- this.txt_depotsId.Size = new System.Drawing.Size(191, 28);
+ this.txt_depotsId.Size = new System.Drawing.Size(196, 28);
this.txt_depotsId.TabIndex = 445;
//
// txt_suppId
@@ -657,69 +657,69 @@
this.txt_suppId.Location = new System.Drawing.Point(114, 76);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(191, 28);
+ this.txt_suppId.Size = new System.Drawing.Size(196, 28);
this.txt_suppId.TabIndex = 440;
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(903, 76);
+ this.txt_fstatus.Location = new System.Drawing.Point(920, 76);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fstatus.Size = new System.Drawing.Size(295, 24);
+ this.txt_fstatus.Size = new System.Drawing.Size(299, 24);
this.txt_fstatus.StyleController = this.layoutMx1;
this.txt_fstatus.TabIndex = 458;
this.txt_fstatus.Tag = "readOnly";
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(309, 12);
+ this.txt_fType.Location = new System.Drawing.Point(314, 12);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_fType.Size = new System.Drawing.Size(293, 24);
+ this.txt_fType.Size = new System.Drawing.Size(299, 24);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 459;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(708, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(719, 12);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(191, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(197, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 461;
this.txt_createBy.Tag = "readOnly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(708, 44);
+ this.txt_createDate.Location = new System.Drawing.Point(719, 44);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(191, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(197, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 462;
this.txt_createDate.Tag = "readOnly";
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(1005, 12);
+ this.txt_checkUser.Location = new System.Drawing.Point(1022, 12);
this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Size = new System.Drawing.Size(193, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(197, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 463;
this.txt_checkUser.Tag = "readOnly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1005, 44);
+ this.txt_checkDate.Location = new System.Drawing.Point(1022, 44);
this.txt_checkDate.Name = "txt_checkDate";
- this.txt_checkDate.Size = new System.Drawing.Size(193, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(197, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 464;
this.txt_checkDate.Tag = "readOnly";
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(708, 76);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(719, 76);
this.txt_paperBillNo.Name = "txt_paperBillNo";
- this.txt_paperBillNo.Size = new System.Drawing.Size(191, 24);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(197, 24);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 465;
//
@@ -806,7 +806,7 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1210, 180);
+ this.Root.Size = new System.Drawing.Size(1231, 180);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -815,7 +815,7 @@
this.layoutControlItem1.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(297, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(302, 32);
this.layoutControlItem1.Text = "鏀舵枡缁勭粐";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
@@ -824,7 +824,7 @@
this.layoutControlItem2.Control = this.txt_billNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(297, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(302, 32);
this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
@@ -834,7 +834,7 @@
this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(297, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(302, 32);
this.layoutControlItem3.Text = "閫変緵搴斿晢";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
@@ -844,7 +844,7 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(297, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(302, 32);
this.layoutControlItem4.Text = "閫夋嫨浠撳簱";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
@@ -856,7 +856,7 @@
this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(297, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(302, 32);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫夋嫨鐗╂枡";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -865,53 +865,53 @@
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_createBy;
- this.layoutControlItem11.Location = new System.Drawing.Point(594, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(605, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(297, 32);
+ this.layoutControlItem11.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem11.Text = "寤虹珛浜�";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_createDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(594, 32);
+ this.layoutControlItem12.Location = new System.Drawing.Point(605, 32);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(297, 32);
+ this.layoutControlItem12.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem12.Text = "寤虹珛鏃ユ湡";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_checkUser;
- this.layoutControlItem13.Location = new System.Drawing.Point(891, 0);
+ this.layoutControlItem13.Location = new System.Drawing.Point(908, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(299, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem13.Text = "鎻愪氦妫�楠屼汉";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_checkDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(891, 32);
+ this.layoutControlItem14.Location = new System.Drawing.Point(908, 32);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(299, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem14.Text = "鎻愪氦妫�楠屾棩鏈�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fstatus;
- this.layoutControlItem7.Location = new System.Drawing.Point(891, 64);
+ this.layoutControlItem7.Location = new System.Drawing.Point(908, 64);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(299, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem7.Text = "鎻愪氦妫�楠�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem7.TextVisible = false;
@@ -919,10 +919,10 @@
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fType;
- this.layoutControlItem8.Location = new System.Drawing.Point(297, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(302, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(297, 32);
+ this.layoutControlItem8.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem8.Text = "濮斿鏍囪瘑";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -930,45 +930,45 @@
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txtSupplierCode;
- this.layoutControlItem5.Location = new System.Drawing.Point(297, 32);
+ this.layoutControlItem5.Location = new System.Drawing.Point(302, 32);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(297, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txtDepotsCode;
- this.layoutControlItem6.Location = new System.Drawing.Point(297, 64);
+ this.layoutControlItem6.Location = new System.Drawing.Point(302, 64);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(297, 32);
+ this.layoutControlItem6.Size = new System.Drawing.Size(303, 32);
this.layoutControlItem6.Text = "浠撳簱缂栫爜";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_remark;
- this.layoutControlItem17.Location = new System.Drawing.Point(297, 96);
+ this.layoutControlItem17.Location = new System.Drawing.Point(302, 96);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(594, 32);
+ this.layoutControlItem17.Size = new System.Drawing.Size(606, 32);
this.layoutControlItem17.Text = "澶囨敞淇℃伅";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
// lab_paperBillNo
//
this.lab_paperBillNo.Control = this.txt_paperBillNo;
- this.lab_paperBillNo.Location = new System.Drawing.Point(594, 64);
+ this.lab_paperBillNo.Location = new System.Drawing.Point(605, 64);
this.lab_paperBillNo.Name = "lab_paperBillNo";
this.lab_paperBillNo.OptionsTableLayoutItem.ColumnIndex = 2;
this.lab_paperBillNo.OptionsTableLayoutItem.RowIndex = 2;
- this.lab_paperBillNo.Size = new System.Drawing.Size(297, 32);
+ this.lab_paperBillNo.Size = new System.Drawing.Size(303, 32);
this.lab_paperBillNo.Text = "閫佽揣鍗曞彿";
this.lab_paperBillNo.TextSize = new System.Drawing.Size(90, 18);
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
index 617a312..67a273d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
@@ -37,11 +37,17 @@
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -58,7 +64,7 @@
this.gv_msg.OptionsColumn.AllowEdit = false;
this.gv_msg.Tag = "query_MSG";
this.gv_msg.Visible = true;
- this.gv_msg.VisibleIndex = 4;
+ this.gv_msg.VisibleIndex = 3;
this.gv_msg.Width = 20;
//
// gv_userName
@@ -83,8 +89,6 @@
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 = 2;
this.gv_operationTable.Width = 100;
//
// gv_operationTime
@@ -122,6 +126,9 @@
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
+ this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemMemoEdit1,
+ this.repositoryItemMemoEdit2});
this.gcMain.Size = new System.Drawing.Size(1126, 531);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -136,7 +143,9 @@
this.gv_userName,
this.gv_operationTable,
this.gridColumn1,
- this.gv_msg});
+ this.gv_msg,
+ this.gridColumn2,
+ this.gridColumn3});
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -150,8 +159,40 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.VisibleIndex = 2;
this.gridColumn1.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鍙戦�丣SON";
+ this.gridColumn2.ColumnEdit = this.repositoryItemMemoEdit1;
+ this.gridColumn2.FieldName = "sendJson";
+ this.gridColumn2.MaxWidth = 300;
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.Width = 94;
+ //
+ // repositoryItemMemoEdit1
+ //
+ this.repositoryItemMemoEdit1.Name = "repositoryItemMemoEdit1";
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "杩斿洖JSON";
+ this.gridColumn3.ColumnEdit = this.repositoryItemMemoEdit2;
+ this.gridColumn3.FieldName = "rtnJson";
+ this.gridColumn3.MaxWidth = 300;
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 5;
+ this.gridColumn3.Width = 94;
+ //
+ // repositoryItemMemoEdit2
+ //
+ this.repositoryItemMemoEdit2.Name = "repositoryItemMemoEdit2";
//
// xtraTabControl1
//
@@ -195,6 +236,8 @@
this.Text = "绯荤粺鏃ュ織";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
@@ -213,5 +256,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index c90789d..1bbd542 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1617,6 +1617,8 @@
<None Include="Resources\properties_16x16.png" />
<None Include="Resources\recurringappointment_16x16.png" />
<None Include="Resources\edit_16x16.png" />
+ <None Include="Resources\meeting_32x321.png" />
+ <None Include="Resources\meeting_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 4755668..282477f 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1293,6 +1293,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap meeting_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("meeting_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap meeting_32x32 {
get {
object obj = ResourceManager.GetObject("meeting_32x32", resourceCulture);
@@ -1303,6 +1313,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap meeting_32x321 {
+ get {
+ object obj = ResourceManager.GetObject("meeting_32x321", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap newitem_16x16 {
get {
object obj = ResourceManager.GetObject("newitem_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index f17ed41..0d08763 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -121,6 +121,9 @@
<data name="iconsetarrows3_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconsetarrows3_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\meeting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -145,11 +148,6 @@
</data>
<data name="lookup&reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\lookup&reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -202,6 +200,9 @@
<value>..\Resources\3dcolumn_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="download_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\download_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -474,6 +475,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -724,13 +730,13 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
- </data>
- <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
+ <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
@@ -904,7 +910,7 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="meeting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\meeting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/meeting_16x16.png b/DevApp/Gs.DevApp/Resources/meeting_16x16.png
new file mode 100644
index 0000000..c57fad4
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/meeting_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/meeting_32x321.png b/DevApp/Gs.DevApp/Resources/meeting_32x321.png
new file mode 100644
index 0000000..08ac68b
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/meeting_32x321.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs
index 3a0d915..1e33f42 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs
@@ -104,8 +104,6 @@
this.gv_operationTable.Name = "gv_operationTable";
this.gv_operationTable.OptionsColumn.ReadOnly = true;
this.gv_operationTable.Tag = "query_a.OPERATION_TABLE";
- this.gv_operationTable.Visible = true;
- this.gv_operationTable.VisibleIndex = 2;
this.gv_operationTable.Width = 80;
//
// gv_msg
@@ -118,7 +116,7 @@
this.gv_msg.OptionsColumn.ReadOnly = true;
this.gv_msg.Tag = "query_a.MSG";
this.gv_msg.Visible = true;
- this.gv_msg.VisibleIndex = 3;
+ this.gv_msg.VisibleIndex = 2;
this.gv_msg.Width = 300;
//
// pageBar1
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 06a565c..377fe4c 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -64,6 +64,7 @@
this.btnFjieAn = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnLayout = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnOa = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -112,9 +113,10 @@
this.btnZhongTai,
this.btnWg,
this.btnHelp,
- this.btnLayout});
+ this.btnLayout,
+ this.btnOa});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 54;
+ this.barManager1.MaxItemId = 55;
//
// bar2
//
@@ -152,6 +154,7 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnZhongTai),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnJieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnFjieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
+ new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnOa, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(this.btnLayout),
new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp)});
this.bar2.OptionsBar.AllowQuickCustomization = false;
@@ -463,6 +466,15 @@
this.btnHelp.ItemAppearance.Normal.Options.UseFont = true;
this.btnHelp.Name = "btnHelp";
//
+ // btnOa
+ //
+ this.btnOa.Caption = "鎻愪氦OA";
+ this.btnOa.Id = 54;
+ this.btnOa.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.meeting_16x16;
+ this.btnOa.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.meeting_32x321;
+ this.btnOa.Name = "btnOa";
+ this.btnOa.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// barDockControlTop
//
this.barDockControlTop.CausesValidation = false;
@@ -475,7 +487,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 68);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 72);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -504,7 +516,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 68);
+ this.Size = new System.Drawing.Size(1543, 72);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -549,5 +561,6 @@
private DevExpress.XtraBars.BarLargeButtonItem btnWg;
private DevExpress.XtraBars.BarLargeButtonItem btnHelp;
private DevExpress.XtraBars.BarLargeButtonItem btnLayout;
+ private DevExpress.XtraBars.BarLargeButtonItem btnOa;
}
}
--
Gitblit v1.9.3