From cbb5315301b1490b57497212256c5255e5eb7eb6 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 01 十一月 2025 17:06:58 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/ShowLogcs.cs | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
index 29aeb8b..72aa9a3 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
@@ -3,10 +3,7 @@
using Newtonsoft.Json;
using System;
using System.Data;
-using System.Drawing;
-using System.Linq;
using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
@@ -15,15 +12,34 @@
{
public string guidKey;
- public ShowLogcs(string _guidKey)
+ public bool isLog;
+ public ShowLogcs(string _guidKey, bool _isLog = false)
{
this.guidKey = _guidKey;
+ this.isLog = _isLog;
InitializeComponent();
+ if (isLog == true)
+ {
+ gridColumn1.Visible = true;
+ gridColumn2.Visible = true;
+ gridColumn1.VisibleIndex = 99;
+ gridColumn2.VisibleIndex = 100;
+ this.gridView1.RowHeight = 150;
+ gv_msg.Visible = false;
+ gv_userName.Visible = false;
+ gridView1.OptionsView.ShowAutoFilterRow = false;
+ }
+ else
+ {
+ gv_msg.Visible = true;
+ gv_userName.Visible = true;
+ this.gridView1.RowHeight = -1;
+ gridView1.OptionsView.ShowAutoFilterRow = true;
+ }
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
-
}, null, false);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1, 999999);
}
@@ -34,7 +50,12 @@
private void getPageList(int curPage, int pageSize)
{
var _sbSqlWhere = new StringBuilder();
- _sbSqlWhere.Append(" and ABT_GUID='"+this.guidKey + "'");
+ _sbSqlWhere.Append(" and ABT_GUID='" + this.guidKey + "'");
+ //濡傛灉鏄棩蹇楃被锛屼粎浠呮樉绀烘棩蹇�
+ if (isLog == true)
+ {
+ _sbSqlWhere.Append(" and isnull(IS_ERP,0)=1");
+ }
var pgq = new PageQueryModel(curPage, 999999, "OPERATION_TIME",
"desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
--
Gitblit v1.9.3