diff --git a/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customerinfo/BmsCustomerController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customerinfo/BmsCustomerController.java index 3b95a357..90a8c546 100644 --- a/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customerinfo/BmsCustomerController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customerinfo/BmsCustomerController.java @@ -5,6 +5,7 @@ import java.util.List; import com.bms.customer.customerinfo.domain.BmsCustomerAttachment; import com.bms.customer.customerinfo.domain.BmsCustomerCompany; import com.bms.customer.customerinfo.domain.BmsCustomerContact; +import com.bms.customer.customerinfo.vo.UnlinkedSalesCustomerVO; import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -52,6 +53,17 @@ public class BmsCustomerController extends BaseController return getDataTable(list); } + /** 查询未关联业务员的客户列表 */ + @PreAuthorize("@ss.hasPermi('customersupplier:customerinfo:list')") + @GetMapping("/unlinked-sales-user/list") + public TableDataInfo unlinkedSalesUserList() + { + startPage(); + BmsCustomer query = new BmsCustomer(); + List list = bmsCustomerService.selectUnlinkedSalesUserCustomerList(query); + return getDataTable(list); + } + /** * 客户下拉选项。 * 只返回客户ID、客户编码、客户名称,供各页面下拉框使用。 diff --git a/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/BmsCustomerMapper.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/BmsCustomerMapper.java index 937fdc9f..bbc75226 100644 --- a/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/BmsCustomerMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/mapper/BmsCustomerMapper.java @@ -2,7 +2,6 @@ package com.bms.customer.customerinfo.mapper; import java.util.List; import com.bms.customer.customerinfo.domain.BmsCustomer; -import com.bms.customer.customerinfo.domain.BmsCustomerOption; import com.bms.customer.customerinfo.domain.BmsCustomerAttachment; import com.bms.customer.customerinfo.domain.BmsCustomerCompany; import com.bms.customer.customerinfo.domain.BmsCustomerContact; @@ -44,6 +43,9 @@ public interface BmsCustomerMapper */ public List selectCustomerOptions(BmsCustomer query); + /** 独立分页查询未关联业务员的客户,仅按 sales_user_id 为空筛选。 */ + public List selectUnlinkedSalesUserCustomerList(BmsCustomer query); + /** 校验业务员用户ID仍对应未删除的系统用户。 */ public int countValidSalesUserId(@org.apache.ibatis.annotations.Param("salesUserId") String salesUserId); diff --git a/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/IBmsCustomerService.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/IBmsCustomerService.java index ea16cab0..6b1c42bd 100644 --- a/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/IBmsCustomerService.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/IBmsCustomerService.java @@ -7,6 +7,7 @@ import com.bms.customer.customerinfo.domain.BmsCustomerAttachment; import com.bms.customer.customerinfo.domain.BmsCustomerCompany; import com.bms.customer.customerinfo.domain.BmsCustomerContact; import com.bms.customer.customerinfo.domain.BmsCustomerLog; +import com.bms.customer.customerinfo.vo.UnlinkedSalesCustomerVO; /** * 客户主Service接口 @@ -40,6 +41,9 @@ public interface IBmsCustomerService */ public List selectBmsCustomerList(BmsCustomer bmsCustomer); + /** 独立查询未关联业务员的客户。 */ + public List selectUnlinkedSalesUserCustomerList(BmsCustomer query); + /** * 查询客户下拉选项。 * 只返回客户ID、客户编码、客户名称;keywords 按客户名称、客户编码、对外代码模糊查询。 diff --git a/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/impl/BmsCustomerServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/impl/BmsCustomerServiceImpl.java index cdadab8f..ec2b7a8e 100644 --- a/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/impl/BmsCustomerServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/service/impl/BmsCustomerServiceImpl.java @@ -19,6 +19,7 @@ import com.bms.customer.customerinfo.mapper.BmsCustomerMapper; import com.bms.customer.customerinfo.domain.BmsCustomer; import com.bms.customer.customerinfo.domain.BmsCustomerOption; import com.bms.customer.customerinfo.domain.BmsCustomerLog; +import com.bms.customer.customerinfo.vo.UnlinkedSalesCustomerVO; import com.bms.customer.customerinfo.service.IBmsCustomerLogService; import com.bms.customer.customerinfo.service.IBmsCustomerService; import com.bms.customer.customermoney.service.ICustomerMoneyService; @@ -90,6 +91,14 @@ public class BmsCustomerServiceImpl implements IBmsCustomerService return bmsCustomerMapper.selectBmsCustomerList(bmsCustomer); } + /** 查询未关联业务员客户,保留客户业务员维度的数据范围。 */ + @Override + @DataScope(deptAlias = "su", deptField = "dept_id", userAlias = "su", userField = "user_id") + public List selectUnlinkedSalesUserCustomerList(BmsCustomer query) + { + return bmsCustomerMapper.selectUnlinkedSalesUserCustomerList(query); + } + /** * 客户下拉选项。数据权限与客户列表一致,只查下拉需要的字段。 */ diff --git a/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/vo/UnlinkedSalesCustomerVO.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/vo/UnlinkedSalesCustomerVO.java new file mode 100644 index 00000000..9bfc324b --- /dev/null +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/vo/UnlinkedSalesCustomerVO.java @@ -0,0 +1,16 @@ +package com.bms.customer.customerinfo.vo; + +import lombok.Data; + +/** 未关联业务员客户弹窗专用列表响应。 */ +@Data +public class UnlinkedSalesCustomerVO +{ + private Long customerId; + private String customerCode; + private String customerName; + private String customerCodeDw; + private String customerType; + private String isEnable; + private String sourceSalesCode; +} diff --git a/bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml b/bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml index a7784d02..8ac9eef2 100644 --- a/bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml @@ -112,6 +112,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by c.customer_id desc + + diff --git a/bms-front/src/api/customersuppliermanagement/customerinfo/customer.js b/bms-front/src/api/customersuppliermanagement/customerinfo/customer.js index 6d4dc205..158877d5 100644 --- a/bms-front/src/api/customersuppliermanagement/customerinfo/customer.js +++ b/bms-front/src/api/customersuppliermanagement/customerinfo/customer.js @@ -9,6 +9,15 @@ export function listCustomer(query) { }) } +// 分页查询未关联业务员的客户 +export function listUnlinkedSalesUserCustomers(query) { + return request({ + url: '/customersupplier/customerinfo/unlinked-sales-user/list', + method: 'get', + params: query + }) +} + // 客户下拉选项:只返回客户ID、客户编码、客户名称 // keywords 按客户名称、客户编码、对外代码模糊查询 export function listCustomerOption(query) { diff --git a/bms-front/src/views/customersuppliermanagement/customerinfo/components/CustomerUnlinkedSalesDialog.vue b/bms-front/src/views/customersuppliermanagement/customerinfo/components/CustomerUnlinkedSalesDialog.vue new file mode 100644 index 00000000..3e9f1445 --- /dev/null +++ b/bms-front/src/views/customersuppliermanagement/customerinfo/components/CustomerUnlinkedSalesDialog.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/bms-front/src/views/customersuppliermanagement/customerinfo/index.vue b/bms-front/src/views/customersuppliermanagement/customerinfo/index.vue index 36373df0..bcb7d58b 100644 --- a/bms-front/src/views/customersuppliermanagement/customerinfo/index.vue +++ b/bms-front/src/views/customersuppliermanagement/customerinfo/index.vue @@ -114,6 +114,15 @@ v-hasPermi="['customersupplier:customerinfo:remove']" >删除 + + 未关联业务员 + + +