From 240311e7c3155784ec9e155f4eda3d16e4a141ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Tue, 30 Jul 2024 14:01:03 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99=20=E4=BF=AE=E6=94=B9map?= =?UTF-8?q?per=E3=80=81service=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8C=89=E5=89=8D=E7=BC=80=E6=A8=A1=E7=B3=8A=E6=9F=A5?= =?UTF-8?q?=E6=89=BE=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=9B=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7=E8=B5=84?= =?UTF-8?q?=E6=96=99=E5=88=97=E8=A1=A8=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E4=BB=A5=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=AE=A2=E6=88=B7=E4=B8=8B=E6=8B=89=E6=A1=86=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD=E7=9A=84=E5=AE=9E=E7=8E=B0=EF=BC=9B?= =?UTF-8?q?=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=20=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2select2?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E7=BB=91=E5=AE=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=EF=BC=8C=E5=AE=9E=E7=8E=B0=E4=B8=8B=E6=8B=89=E6=A1=86?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B7=BB=E5=8A=A0=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=9A=E5=8A=A1=E5=91=98=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86=E4=B8=BA=E5=8F=AA=E8=AF=BB=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=95=B0=E6=8D=AE=E6=BA=90=E4=B8=BA=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=99=BB=E5=BD=95=E5=90=8D=E7=A7=B0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCustomerController.java | 11 ++ .../system/mapper/SysCustomerMapper.java | 7 ++ .../system/service/ISysCustomerService.java | 2 + .../service/impl/SysCustomerServiceImpl.java | 6 + .../mapper/system/SysCustomerMapper.xml | 8 ++ .../templates/system/salesOrder/add.html | 110 ++++++++++++------ 6 files changed, 110 insertions(+), 34 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java index c363c94c..234b2871 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java @@ -287,6 +287,17 @@ public class SysCustomerController extends BaseController List list = sysCustomerService.selectSysCustomerToList(); return getDataTable(list); } + // 前缀查询客户列表 + @RequestMapping("/matchCustomerList") + @ResponseBody + public AjaxResult getMatchCustomerList(@RequestParam(value = "q",defaultValue = "") String prefix){ + if (prefix == null || prefix.isEmpty()){ + List list = sysCustomerService.selectSysCustomerToList(); + return success(list); + } + List list = sysCustomerService.getMatchCustomerList(prefix); + return success(list); + } @PostMapping("/contactsList") @ResponseBody public TableDataInfo list(SysContacts sysContacts) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java index e53fe86e..86bc6c26 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java @@ -24,6 +24,13 @@ public interface SysCustomerMapper List selectSysCustomerToList(); + /** + * 前缀匹配查询客户信息列表 + * + * @param enterpriseCode 客户ID + * @return 客户基本信息集合 + */ + List searchCustomersByPrefix(String enterpriseCode); /** * 查询客户基本信息列表 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java index e2ee02ef..c6c52d2c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysCustomerService.java @@ -97,4 +97,6 @@ public interface ISysCustomerService CustomerDto selectCustomerDtoByEnterpriseCode(String customerId); List selectSysCustomerWithComplaintNotice(); + + List getMatchCustomerList(String customerCode); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java index 6e46e2cd..ece5585c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java @@ -147,6 +147,7 @@ public class SysCustomerServiceImpl implements ISysCustomerService return sysCustomerMapper.selectSysCustomerToList(); } + /** * 新增客户基本信息 * @@ -243,6 +244,11 @@ public class SysCustomerServiceImpl implements ISysCustomerService return sysCustomers; } + @Override + public List getMatchCustomerList(String customerCode) { + return sysCustomerMapper.searchCustomersByPrefix(customerCode); + } + @Override public int deleteSysCustomerByIds(String[] ids) { return sysCustomerMapper.deleteSysCustomerByIds(ids); diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml index 907b0053..8d501482 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml @@ -87,6 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and use_status = '1' and use_status = '1' + + + + where use_status = '1' and use_status = '1' + and enterprise_code like concat(#{prefix}, '%') escape '\\' + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html index 27dbf13e..5ef5c878 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html @@ -83,7 +83,7 @@
- +
@@ -262,8 +262,9 @@
- + + +
@@ -318,8 +319,10 @@ var processMethodDatas = [[${@dict.getType('processMethod')}]]; var loginName = [[${@permission.getPrincipalProperty('loginName')}]]; var warehouseDeptDatas = [[${@dict.getType('warehouseDept')}]]; + var customerList = []; var prefix = ctx + "system/salesOrder" $(function() { + $("#businessMembers_add").val(loginName); var options = { id:'bootstrap-sub-table-order', pagination: false, @@ -511,22 +514,22 @@ function selectBuniesessMembers(){ //获取业务员 - $.ajax({ - url: ctx + 'system/salesOrder/getBinessMembers', - type: 'get', - success: function (res) { - console.log(res) - if (res.rows.length > 0) { - var usertData = res.rows; - for (let i in usertData) { - $("select[name='businessMembers']").append( - ""); - } - } else { - $.modal.msgError(res.msg); - } - } - }); + // $.ajax({ + // url: ctx + 'system/salesOrder/getBinessMembers', + // type: 'get', + // success: function (res) { + // console.log(res) + // if (res.rows.length > 0) { + // var usertData = res.rows; + // for (let i in usertData) { + // $("select[name='businessMembers']").append( + // ""); + // } + // } else { + // $.modal.msgError(res.msg); + // } + // } + // }); //获取单号 $.ajax({ url: prefix + "/getId", @@ -543,33 +546,72 @@ allowClear: true, placeholder: "请选择客户", ajax:{ - type: "post", - url:ctx + "system/customer/customerList", + type: "get", + url:ctx + "system/customer/matchCustomerList", dataType:"json", delay:250, + timeout: 10000, // 设置超时时间为10秒 cache:true, processResults: function (res, params) { - var resultList = res.rows; - console.log("传输的数值"); - console.log(resultList); var options = []; - for(var i= 0, len=resultList.length;i 0) { + // 设置下拉框的值 + $("select[name='enterpriseCode']").val(enterpriseCode).trigger('change'); + } else { + console.error("尝试设置的值不存在于下拉框中:", enterpriseCode); + } + } else { + // 清空下拉框的值 + // $("select[name='enterpriseCode']").val(null).trigger('change'); + } + }); + $('#enterpriseCode').on('select2:select', function (e) { var data = e.params.data; $("input[name='enterpriseName']").val(data.enterpriseName);