From afb82d4d75ae1b58385c168ba85ba44c00fc980c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 11 十一月 2024 08:16:23 +0800
Subject: [PATCH] 附件上传
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 20 ++
DevApp/Gs.DevApp/Resources/download_16x161.png | 0
DevApp/Gs.DevApp/Gs.DevApp.csproj | 2
DevApp/Gs.DevApp/Resources/printlayoutview_32x32.png | 0
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 52 +++++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 40 ++++
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 4
DevApp/Gs.DevApp/Properties/Resources.resx | 10
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 44 +++
DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.Designer.cs | 1
DevApp/Gs.DevApp/Resources/printlayoutview_16x16.png | 0
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 114 +++++++----
DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.resx | 244 +++++++++++------------
DevApp/Gs.DevApp/UserControl/ShowFile.cs | 12
14 files changed, 358 insertions(+), 185 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index d5cc058..532dd93 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -40,6 +40,11 @@
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 editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -132,6 +137,8 @@
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
@@ -187,6 +194,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).BeginInit();
@@ -1250,7 +1258,8 @@
this.gcMx3.Name = "gcMx3";
this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
- this.repositoryItemButtonEdit2});
+ this.repositoryItemButtonEdit2,
+ this.repositoryItemButtonEdit3});
this.gcMx3.Size = new System.Drawing.Size(1340, 401);
this.gcMx3.TabIndex = 2;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1266,6 +1275,7 @@
this.gridColumn8,
this.gridColumn9,
this.gridColumn10,
+ this.gridColumn16,
this.gridColumn12});
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
@@ -1355,6 +1365,27 @@
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
//
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "涓嬭浇";
+ this.gridColumn16.ColumnEdit = this.repositoryItemButtonEdit3;
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 6;
+ this.gridColumn16.Width = 94;
+ //
+ // repositoryItemButtonEdit3
+ //
+ this.repositoryItemButtonEdit3.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit3.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)});
+ this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
+ this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
+ //
// gridColumn12
//
this.gridColumn12.Caption = "绉诲嚭";
@@ -1362,16 +1393,16 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 6;
+ this.gridColumn12.VisibleIndex = 7;
this.gridColumn12.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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);
@@ -1634,6 +1665,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
@@ -1766,5 +1798,7 @@
private UserControl.UcLookSupplier txt_suppId;
private DevExpress.XtraEditors.TextEdit txt_lotNo1;
private DevExpress.XtraEditors.LabelControl labelControl2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index ee5b32c..091673c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -6,8 +6,10 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
+using System.Configuration;
using System.Data;
using System.Drawing;
+using System.Net;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -639,5 +641,43 @@
}
}
+
+ private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx3.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ try
+ {
+ var dr = gvMx3.GetDataRow(rowhandle);
+ var urlPath = dr["urlPath"].ToString();
+ using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+ {
+ folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+ DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+ if (dialogResult == DialogResult.OK)
+ {
+ string _folder = folderBrowserDialog.SelectedPath;
+ string _folderName = _folder + "\\" + urlPath;
+ string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + "upload/" + urlPath;
+ using (WebClient client = new WebClient())
+ {
+ client.DownloadFile(_url, _folderName);
+ }
+ ToolBox.MsgHelper.ShowInformation("涓嬭浇鎴愬姛锛�");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
+ }
+
+ }
+
+
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 17753d8..d9530ec 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -40,6 +40,11 @@
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 editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -94,6 +99,7 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fsubmit = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_modify1Flag = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -134,10 +140,14 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.panel1 = new System.Windows.Forms.Panel();
+ this.lb_qualityAudit = new DevExpress.XtraEditors.LabelControl();
+ this.txt_qualityAudit = new DevExpress.XtraEditors.TextEdit();
this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit();
@@ -155,9 +165,6 @@
this.txt_modify1Flag = new DevExpress.XtraEditors.TextEdit();
this.lb_lotNo = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
- this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_qualityAudit = new DevExpress.XtraEditors.LabelControl();
- this.txt_qualityAudit = new DevExpress.XtraEditors.TextEdit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -193,8 +200,10 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
@@ -202,7 +211,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).BeginInit();
this.SuspendLayout();
//
// tabMxPage1
@@ -853,6 +861,17 @@
this.gv_fsubmit.VisibleIndex = 1;
this.gv_fsubmit.Width = 50;
//
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "璐ㄩ噺瀹℃牳";
+ this.gridColumn12.FieldName = "qualityAudit";
+ this.gridColumn12.MinWidth = 50;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Tag = "query_a.quality_audit";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 2;
+ this.gridColumn12.Width = 50;
+ //
// gv_modify1Flag
//
this.gv_modify1Flag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1262,7 +1281,8 @@
this.gcMx3.Name = "gcMx3";
this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
- this.repositoryItemButtonEdit2});
+ this.repositoryItemButtonEdit2,
+ this.repositoryItemButtonEdit3});
this.gcMx3.Size = new System.Drawing.Size(1340, 391);
this.gcMx3.TabIndex = 1;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1278,6 +1298,7 @@
this.gridColumn7,
this.gridColumn8,
this.gridColumn10,
+ this.gridColumn16,
this.gridColumn9});
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
@@ -1366,6 +1387,27 @@
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
//
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "涓嬭浇";
+ this.gridColumn16.ColumnEdit = this.repositoryItemButtonEdit3;
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 6;
+ this.gridColumn16.Width = 94;
+ //
+ // repositoryItemButtonEdit3
+ //
+ this.repositoryItemButtonEdit3.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x161;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit3.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)});
+ this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
+ this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
+ //
// gridColumn9
//
this.gridColumn9.Caption = "绉诲嚭";
@@ -1373,16 +1415,16 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 6;
+ this.gridColumn9.VisibleIndex = 7;
this.gridColumn9.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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);
@@ -1445,6 +1487,25 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1342, 208);
this.panel1.TabIndex = 1;
+ //
+ // lb_qualityAudit
+ //
+ this.lb_qualityAudit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_qualityAudit.Appearance.Options.UseFont = true;
+ this.lb_qualityAudit.Location = new System.Drawing.Point(1025, 53);
+ this.lb_qualityAudit.Name = "lb_qualityAudit";
+ this.lb_qualityAudit.Size = new System.Drawing.Size(68, 21);
+ this.lb_qualityAudit.TabIndex = 796;
+ this.lb_qualityAudit.Text = "鏄惁瀹℃牳";
+ //
+ // txt_qualityAudit
+ //
+ this.txt_qualityAudit.Location = new System.Drawing.Point(1099, 46);
+ this.txt_qualityAudit.Name = "txt_qualityAudit";
+ this.txt_qualityAudit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_qualityAudit.Properties.Appearance.Options.UseFont = true;
+ this.txt_qualityAudit.Size = new System.Drawing.Size(51, 28);
+ this.txt_qualityAudit.TabIndex = 797;
//
// txt_fmrmode
//
@@ -1611,36 +1672,6 @@
this.txt_lotNo.Size = new System.Drawing.Size(150, 28);
this.txt_lotNo.TabIndex = 262;
//
- // gridColumn12
- //
- this.gridColumn12.Caption = "璐ㄩ噺瀹℃牳";
- this.gridColumn12.FieldName = "qualityAudit";
- this.gridColumn12.MinWidth = 50;
- this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Tag = "query_a.quality_audit";
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 2;
- this.gridColumn12.Width = 50;
- //
- // lb_qualityAudit
- //
- this.lb_qualityAudit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_qualityAudit.Appearance.Options.UseFont = true;
- this.lb_qualityAudit.Location = new System.Drawing.Point(1025, 53);
- this.lb_qualityAudit.Name = "lb_qualityAudit";
- this.lb_qualityAudit.Size = new System.Drawing.Size(68, 21);
- this.lb_qualityAudit.TabIndex = 796;
- this.lb_qualityAudit.Text = "鏄惁瀹℃牳";
- //
- // txt_qualityAudit
- //
- this.txt_qualityAudit.Location = new System.Drawing.Point(1099, 46);
- this.txt_qualityAudit.Name = "txt_qualityAudit";
- this.txt_qualityAudit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_qualityAudit.Properties.Appearance.Options.UseFont = true;
- this.txt_qualityAudit.Size = new System.Drawing.Size(51, 28);
- this.txt_qualityAudit.TabIndex = 797;
- //
// Frm_MesQaItemsDetect01Check
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1684,9 +1715,11 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
@@ -1694,7 +1727,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qualityAudit.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -1827,5 +1859,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraEditors.LabelControl lb_qualityAudit;
private DevExpress.XtraEditors.TextEdit txt_qualityAudit;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index e21b553..2f8c5a5 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -5,8 +5,10 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
+using System.Configuration;
using System.Data;
using System.Drawing;
+using System.Net;
using System.Windows.Forms;
using static DevExpress.XtraPrinting.Native.PageSizeInfo;
@@ -444,8 +446,56 @@
return;
if (e.Button.Index == 0)
{
- MsgHelper.Warning("鎻愮ず锛�" + "寮�鍙戜腑");
+ try
+ {
+ var dr = gvMx3.GetDataRow(rowhandle);
+ var urlPath = dr["urlPath"].ToString();
+ Gs.DevApp.UserControl.ShowFile frm = new ShowFile(urlPath);
+ frm.ShowDialog();
+ }
+ catch (Exception ex)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
+ }
+
}
}
+
+ private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx3.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ try
+ {
+ var dr = gvMx3.GetDataRow(rowhandle);
+ var urlPath = dr["urlPath"].ToString();
+ using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+ {
+ folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+ DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+ if (dialogResult == DialogResult.OK)
+ {
+ string _folder = folderBrowserDialog.SelectedPath;
+ string _folderName = _folder + "\\" + urlPath;
+ string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + "upload/" + urlPath;
+ using (WebClient client = new WebClient())
+ {
+ client.DownloadFile(_url, _folderName);
+ }
+ ToolBox.MsgHelper.ShowInformation("涓嬭浇鎴愬姛锛�");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
+ }
+
+ }
+
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.Designer.cs
index 91a1d1a..14e14cf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.Designer.cs
@@ -52,7 +52,6 @@
this.ClientSize = new System.Drawing.Size(712, 543);
this.Controls.Add(this.previewControl1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png;
- this.MinimizeBox = false;
this.Name = "RptPreview";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "RptUser";
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.resx
index bfad99e..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.resx
@@ -1,134 +1,120 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
- xmlns="">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
- <xsd:element name="root" msdata:IsDataSet="true">
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
<xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string"
- minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="name" use="required"
- type="xsd:string"/>
- <xsd:attribute name="type" type="xsd:string"/>
- <xsd:attribute name="mimetype" type="xsd:string"/>
- <xsd:attribute ref="xml:space"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string"/>
- <xsd:attribute name="name" type="xsd:string"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string"
- minOccurs="0" msdata:Ordinal="1"/>
- <xsd:element name="comment" type="xsd:string"
- minOccurs="0" msdata:Ordinal="2"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string"
- use="required" msdata:Ordinal="1"/>
- <xsd:attribute name="type" type="xsd:string"
- msdata:Ordinal="3"/>
- <xsd:attribute name="mimetype" type="xsd:string"
- msdata:Ordinal="4"/>
- <xsd:attribute ref="xml:space"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string"
- minOccurs="0" msdata:Ordinal="1"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string"
- use="required"/>
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
</xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms,
- Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- </value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms,
- Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- </value>
- </resheader>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 7b2432a..5e4fca6 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -837,6 +837,8 @@
<None Include="Resources\print_16x16.png" />
<None Include="Resources\printlayoutview_32x32.png" />
<None Include="Resources\printlayoutview_16x16.png" />
+ <None Include="Resources\download_16x16.png" />
+ <None Include="Resources\download_16x161.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 72372d8..31d37cb 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -513,6 +513,26 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap download_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("download_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap download_16x161 {
+ get {
+ object obj = ResourceManager.GetObject("download_16x161", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap download_32x32 {
get {
object obj = ResourceManager.GetObject("download_32x32", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 81721a1..bad6e65 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -186,6 +186,9 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</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>
+ </data>
<data name="sortbyinvoice_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortbyinvoice_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -469,6 +472,9 @@
<data name="updatetableofcontents_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\updatetableofcontents_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="printlayoutview_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\printlayoutview_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="first_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\first_32x321.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -745,7 +751,7 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="printlayoutview_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\printlayoutview_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="download_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\download_16x161.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/download_16x161.png b/DevApp/Gs.DevApp/Resources/download_16x161.png
new file mode 100644
index 0000000..7169f16
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/download_16x161.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/printlayoutview_16x16.png b/DevApp/Gs.DevApp/Resources/printlayoutview_16x16.png
new file mode 100644
index 0000000..6e70bf9
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/printlayoutview_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/printlayoutview_32x32.png b/DevApp/Gs.DevApp/Resources/printlayoutview_32x32.png
new file mode 100644
index 0000000..66833f4
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/printlayoutview_32x32.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFile.cs b/DevApp/Gs.DevApp/UserControl/ShowFile.cs
index 479b224..df09a25 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFile.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFile.cs
@@ -3,6 +3,7 @@
using System;
using System.Configuration;
using System.IO;
+using System.Net;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
@@ -28,8 +29,9 @@
private void ShowFile_Load(object sender, EventArgs e)
{
- string _h5 = GetFileType(urlPath);
- string _url = WebApiUrl + "upload/" + _h5 + "?filePath=" + urlPath + "&mid=" + Guid.NewGuid().ToString();
+ string filePath = System.Uri.EscapeUriString(urlPath);
+ string fileType = GetFileType(urlPath);
+ string _url = WebApiUrl + "upload/h5/site.html?fileType=" + fileType + "&filePath=" + filePath + "&mid=" + Guid.NewGuid().ToString();
chromeBrowser = new ChromiumWebBrowser(_url);
this.pane1.Controls.Add(chromeBrowser);
chromeBrowser.Dock = DockStyle.Fill;
@@ -47,13 +49,13 @@
case ".jpg":
case ".jpeg":
case ".png":
- return "h5Image.html";
+ return "img";
case ".pdf":
- return "h5Pdf.html";
+ return "pdf";
// 娣诲姞鍏朵粬鏂囦欢绫诲瀷
// ...
default:
- return "h5Other.html";
+ return "other";
}
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index b595b7b..ba0b8a3 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -393,7 +393,7 @@
if (_bl)
{
var frm = new RptPreview(guidKey, rptParameter);
- frm.Show();
+ frm.ShowDialog();
return;
}
@@ -418,7 +418,7 @@
if (_bl)
{
var frm = new EasyRptDesign(guidKey, rptParameter);
- frm.Show();
+ frm.ShowDialog();
return;
}
//鍚﹀垯鍚戝璁捐妯℃澘
--
Gitblit v1.9.3