From 96bad4b7c641fde93262bcc01fc6de37b8fb39bc Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 22 Nov 2024 10:58:36 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99=E6=8E=92=E5=BA=8F=20?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E5=89=8D=E7=AB=AF=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=8C=89=E9=92=AE=20=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BA=BA=E5=AD=97=E6=AE=B5=E5=92=8C=E5=85=B6?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/purchase/PurchasePlanMapper.xml   |  1 +
 .../templates/purchase/purchasePlan/purchasePlan.html  | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanMapper.xml
index f9cd1dc2..5c7a2d6d 100644
--- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanMapper.xml
@@ -42,6 +42,7 @@
             <if test="purchasePlanType != null  and purchasePlanType != ''"> and purchase_plan_type = #{purchasePlanType}</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectPurchasePlanById" parameterType="Long" resultMap="PurchasePlanResult">
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html
index 188ea481..db95ddaf 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/purchasePlan.html
@@ -25,10 +25,6 @@
                                 <label>关联单号：</label>
                                 <input type="text" name="correlationCode"/>
                             </li>
-                            <li>
-                                <label>申请人：</label>
-                                <input type="text" name="applyUser"/>
-                            </li>
                             <li class="select-time">
                                 <label>录入时间：</label>
                                 <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
@@ -86,6 +82,7 @@
                 detailView: true,
                 fixedColumns: true, // 启用冻结列
                 fixedRightNumber: 1, // 冻结右列个数
+                sortable: true,
                 onExpandRow : function(index,row,$detail){
                     $detail.html('<table class="table-container" id="purchase_plan_'+row.id+'"></table>').find('table');
                     // 一阶
@@ -108,8 +105,9 @@
                     {title: '作废总数',field: 'cancelSum',},
                     {title: '不含税总价(RMB)',field: 'noRmbSum',},
                     {title: '含税总价(RMB)',field: 'rmbSum',},
-                    {title: '申请人',field: 'applyUser',},
-                    {title: '录入时间',field: 'createTime',},
+                    {title: '录入时间',field: 'createTime',
+                     sortable: true,
+                    },
                     {title: '更新人',field: 'updateBy',},
                     {title: '上次更新时间',field: 'updateTime',},
                     {title: '操作',align: 'center',