[feat] 销售管理

修改销售后端分页查询接口和前端筛选条件：新增销售订单可以根据订单类型进行筛选
新增销售订单可以根据订单类型进行筛选导出的问题

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

@@ -127,6 +127,7 @@ 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="salesOrderType != null  and salesOrderType != ''"> and s.sales_order_type = #{salesOrderType}</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>
@@ -190,6 +191,7 @@ 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="salesOrderType != null  and salesOrderType != ''"> and s.sales_order_type = #{salesOrderType}</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>

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

@@ -145,6 +145,15 @@
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </li>
+
+                        <li>
+                            <label>订单类型：</label>
+                            <select name="salesOrderType" th:with="type=${@dict.getType('sys_order_type')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+
                         <li>
                             <label>业务员：</label>
                            <select name="businessMembers" class="select-list">