[fix] 销售管理

修改销售后端分页查询接口和前端筛选条件：修复销售订单不能根据录入时间进行筛选的问题
修复销售订单不能根据录入时间筛选进行导出的问题

ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml

@@ -127,6 +127,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryStatus != null  and deliveryStatus != ''"> and s.delivery_status = #{deliveryStatus}</if>
             <if test="closeStatus != null  and closeStatus != ''"> and s.close_status = #{closeStatus}</if>
             <if test="invoice != null  and invoice != ''"> and s.invoice = #{invoice}</if>
+            <if test="params.beginCreateTime != null  and params.beginCreatTime != ''  and params.endCreateTime != null and params.endCreateTime != '' ">
+                and s.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+            </if>
             <if test="materialCode != null and materialCode != ''"> and c.materialCode like concat('%', #{materialCode}, '%')</if>
             <if test="materialName != null and materialName != ''">
                 and c.materialName like concat('%',#{materialName},'%')
@@ -187,6 +190,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryStatus != null  and deliveryStatus != ''"> and s.delivery_status = #{deliveryStatus}</if>
             <if test="closeStatus != null  and closeStatus != ''"> and s.close_status = #{closeStatus}</if>
             <if test="invoice != null  and invoice != ''"> and s.invoice = #{invoice}</if>
+            <if test="params.beginCreateTime != null  and params.beginCreatTime != ''  and params.endCreateTime != null and params.endCreateTime != '' ">
+                and s.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+            </if>
             <if test="materialCode != null and materialCode != ''"> and c.materialCode like concat('%', #{materialCode}, '%')</if>
             <if test="materialName != null and materialName != ''">
                 and c.materialName like concat('%',#{materialName},'%')

ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html

@@ -169,9 +169,9 @@
                         </li>
                         <li class="select-time">
                             <label>录入时间： </label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
                             <span>-</span>
-                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
                         </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
@@ -255,8 +255,6 @@
             cancelUrl: prefix + "/cancel/{id}",
             detailUrl: prefix + "/detail/{id}",
             pagination: true,
-            pageList: [5, 10, 25, 50],
-            pageSize: 10,
             sortable: true,                                     // 是否启用排序
             sortStable: true,                                   // 设置为 true 将获得稳定的排序
             fixedColumns: true, // 启用冻结列