diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java index 9d11d2d6..12bf1e34 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java @@ -147,6 +147,8 @@ public class SysCustomer extends BaseEntity /** 业务员 */ @Excel(name = "业务员") private String businessMembers; + /*业务人员名称*/ + private String businessMembersName; /** 确认人 */ @Excel(name = "确认人") private String identifyingPeople; @@ -241,7 +243,13 @@ public class SysCustomer extends BaseEntity this.customerSign = customerSign; } + public String getBusinessMembersName() { + return businessMembersName; + } + public void setBusinessMembersName(String businessMembersName) { + this.businessMembersName = businessMembersName; + } public String getAuditStatus() { return auditStatus; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java index b42711cb..45b2989e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java @@ -150,6 +150,8 @@ public class SysSalesOrder extends BaseEntity { /*业务人员*/ @Excel(name = "业务人员") private String businessMembers; + /*业务人员名称*/ + private String businessMembersName; /*是否含税*/ @Excel(name = "是否含税") private String confirmTax; @@ -214,6 +216,15 @@ public class SysSalesOrder extends BaseEntity { private String customerDeliveryBillto; /*客户收货人电话(Bill to)*/ private String deliveryPhoneBillto; + + public String getBusinessMembersName() { + return businessMembersName; + } + + public void setBusinessMembersName(String businessMembersName) { + this.businessMembersName = businessMembersName; + } + public Long getSalesOrderId() { return salesOrderId; } 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 c18261a3..965f2c7d 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 @@ -108,6 +108,10 @@ public class SysCustomerServiceImpl implements ISysCustomerService if (sysUser2!=null){ sysCustomerVo.setApplyUserName(sysUser2.getUserName()); } + SysUser sysUser3 = userMapper.selectUserByLoginName(sysCustomerVo.getBusinessMembers()); + if (sysUser3!=null){ + sysCustomerVo.setBusinessMembersName(sysUser3.getUserName()); + } String instanceId = sysCustomerVo.getInstanceId(); // 当前环节 if (StringUtils.isNotBlank(instanceId)) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java index f4e19069..d42f7eda 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java @@ -160,6 +160,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService if (sysUser2!=null){ sysSalesOrderVo.setApplyUserName(sysUser2.getUserName()); } + String instanceId = sysSalesOrderVo.getInstanceId(); // 当前环节 if (StringUtils.isNotBlank(instanceId)) { diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/edit.html b/ruoyi-admin/src/main/resources/templates/system/customer/edit.html index e47606fb..7fdd15ba 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/edit.html @@ -233,7 +233,7 @@
-
@@ -336,11 +336,11 @@ console.log(res) if (res.rows.length > 0) { var usertData = res.rows; + var select = $("#edit_businessMembers"); for (let i in usertData) { - $("select[name='businessMembers']").append(""); + select.append(""); } - $("select[name='businessMembers']").val(customer.businessMembers); + select.val(customer.businessMembers).trigger("change"); } else { $.modal.msgError(res.msg); } diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html index 01f512f5..5c26bbc0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html @@ -258,7 +258,7 @@
-
@@ -324,7 +324,7 @@ $("select[name='businessMembers']").append(""); } - $("select[name='businessMembers']").val(customer.businessMembers); + $("select[name='businessMembers']").val(customer.businessMembers).trigger("change"); } else { $.modal.msgError(res.msg); }