From 17ce16a567fe06e1c44745d8676ae0e5b4416b78 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Tue, 28 Oct 2025 17:24:02 +0800
Subject: [PATCH] 1

---
 .../FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx | 11 ++++++++++-
 .../CQMS/DesignDrawing/ArchivesLibIssue.aspx          |  4 ++--
 .../CQMS/DesignDrawing/ArchivesLibReceive.aspx        |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx
index 7bdb42bb..11f1e9e6 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLib.aspx
@@ -54,7 +54,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" Title="档案文件库"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="updateTime" SortDirection="DESC" OnSort="Grid1_Sort"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="projectDeviceProcedureSubjectCode,formatFileCode,majorNo,fileVersion" SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" EnableTextSelection="true">
                     <Toolbars>
@@ -203,6 +203,10 @@
                     <%-- <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
                     </Listeners>--%>
+
+                    <%--<Listeners>
+                        <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                    </Listeners>--%>
                     <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
                         </f:ToolbarSeparator>
@@ -242,6 +246,11 @@
         </f:Menu>--%>
     </form>
     <script type="text/javascript">
+        //function onGridDataLoad(event) {
+        //    this.mergeColumns(['projectDeviceProcedureSubjectCode', 'wbsFullPath', 'formatFileCode', 'formatFileName', 'majorNo', 'majorName', 'fileVersion'], {
+        //        depends: true
+        //    });
+        //}
        <%-- var menuID = '<%= Menu1.ClientID %>';
 
         // 返回false，来阻止浏览器右键菜单
diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx
index ab7ef1ab..0e10d62b 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibIssue.aspx
@@ -54,7 +54,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" Title="档案文件库"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="updateTime" SortDirection="DESC" OnSort="Grid1_Sort"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="projectDeviceProcedureSubjectCode,formatFileCode,majorNo,fileVersion" SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="100000" OnPageIndexChange="Grid1_PageIndexChange" EnableCheckBoxSelect="true" KeepCurrentSelection="true"
                     EnableRowDoubleClickEvent="true" EnableTextSelection="true">
                     <Toolbars>
@@ -202,7 +202,7 @@
                                 </f:RenderField>
                                 <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="文件" HeaderTextAlign="Center" TextAlign="Left">
                                     <ItemTemplate>
-                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("fileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
+                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("upfileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
                                     </ItemTemplate>
                                 </f:TemplateField>
                             </Columns>
diff --git a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx
index b423237a..5fde4f62 100644
--- a/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/DesignDrawing/ArchivesLibReceive.aspx
@@ -54,7 +54,7 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" Title="档案文件库"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="updateTime" SortDirection="DESC" OnSort="Grid1_Sort"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="projectDeviceProcedureSubjectCode,formatFileCode,majorNo,fileVersion" SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" EnableTextSelection="true">
                     <Toolbars>
@@ -189,7 +189,7 @@
                                 </f:RenderField>
                                 <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="文件" HeaderTextAlign="Center" TextAlign="Left">
                                     <ItemTemplate>
-                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("fileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
+                                        <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" Text='<%# GetFileUrl(Eval("upfileid"),Eval("maintitle")) %>' ToolTip="文件查看"></asp:LinkButton>
                                     </ItemTemplate>
                                 </f:TemplateField>
                             </Columns>