From ebf5653476baf96338b521fbbcde2b44de0cf3d2 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 8 Nov 2024 18:03:05 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E=E9=80=9A=E7=9F=A5=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84bug=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=8D=95=E5=8F=B7=E4=B8=BA=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=EF=BC=9B=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=A0=8F=E7=9A=84=E6=A0=B7=E5=BC=8F=EF=BC=8C=E9=87=87=E7=94=A8?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=EF=BC=9B=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=90=8E=E5=88=86=E9=A1=B5=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=8D=95=E5=8F=B7=E3=80=81=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E3=80=81=E5=AE=A2=E6=88=B7ID=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/sales/SalesAftersalesNoticeMapper.xml    |  6 +++---
 .../sales/afterSalesNotice/afterSalesNotice.html    | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/sales/SalesAftersalesNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/sales/SalesAftersalesNoticeMapper.xml
index 3e297514..593e04ba 100644
--- a/ruoyi-admin/src/main/resources/mapper/sales/SalesAftersalesNoticeMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/sales/SalesAftersalesNoticeMapper.xml
@@ -45,14 +45,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSalesAftersalesNoticeList" parameterType="SalesAftersalesNoticeVO" resultMap="SalesAftersalesNoticeResult">
         <include refid="selectSalesAftersalesNoticeVo"/>
         <where>  
-            <if test="aftersalesNoticeCode != null  and aftersalesNoticeCode != ''"> and aftersales_notice_code = #{aftersalesNoticeCode}</if>
-            <if test="salesOrderCode != null  and salesOrderCode != ''"> and sales_order_code = #{salesOrderCode}</if>
+            <if test="aftersalesNoticeCode != null  and aftersalesNoticeCode != ''"> and aftersales_notice_code like concat('%', #{aftersalesNoticeCode}, '%')</if>
+            <if test="salesOrderCode != null  and salesOrderCode != ''"> and sales_order_code like concat('%', #{salesOrderCode}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
             <if test="aftersalesStatus != null  and aftersalesStatus != ''"> and aftersales_status = #{aftersalesStatus}</if>
             <if test="businessMembers != null  and businessMembers != ''"> and business_members like concat('%', #{businessMembers}, '%')</if>
             <if test="aftersalesMembers != null  and aftersalesMembers != ''"> and aftersales_members like concat('%', #{aftersalesMembers}, '%')</if>
-            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code = #{enterpriseCode}</if>
+            <if test="enterpriseCode != null  and enterpriseCode != ''"> and enterprise_code like concat('%', #{enterpriseCode}, '%')</if>
             <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
             <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
         </where>
diff --git a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html
index 8404ec3a..169c3d3f 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/afterSalesNotice/afterSalesNotice.html
@@ -22,7 +22,7 @@
                                 </select>
                             </li>
                             <li>
-                                <label>关联订单号：</label>
+                                <label>关联销售单号：</label>
                                 <input type="text" name="salesOrderCode"/>
                             </li>
                             <li>
@@ -261,17 +261,18 @@
                                     var todoUserIdList = row.todoUserId.split(",");
                                     if(todoUserIdList.includes(loginName) || loginName == 'admin'){
                                         var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
-                                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
+                                        actions.push('<a  href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
                                     }
                                 }
                                 // 审批历史
-                                actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
+                                actions.push('<a href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
                                 // 进度查看
-                                actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
+                                actions.push('<a  href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
                             }
                             // 详情
-                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="detail(\'' + row.aftersalesNoticeCode + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                            return actions.join('');
+                            actions.push('<a href="javascript:void(0)" onclick="detail(\'' + row.aftersalesNoticeCode + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                            var actionLinks = actions.join('');
+                            return $.table.dropdownToggle(actionLinks);
                         }
                     }]
             };