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 c7e0494a..d2a0126d 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 @@ -111,10 +111,6 @@ public class SysCustomerController extends BaseController if (roleKeys.contains("ywyRole")) { sysCustomerVo.setApplyUser(curUser.getLoginName()); } - - String tempLoginName = sysCustomerService.convertName(sysCustomerVo); - sysCustomerVo.setBusinessMembers(tempLoginName); - startPage(); List list = sysCustomerService.selectSysCustomerList(sysCustomerVo); return getDataTable(list); diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml index e2607e46..08db9894 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml @@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and s.customer_abbreviation like concat('%', #{customerAbbreviation}, '%') and s.delivery_address like concat('%', #{deliveryAddress}, '%') and s.first_add_time between #{params.beginCreateTime} and #{params.endCreateTime} - and s.customer_sign = #{customerSign} + and s.customer_sign = #{customerSign} order by s.audit_status asc, s.create_time desc diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html index 5f3654ce..e6fd24d9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html @@ -435,6 +435,7 @@ var useStatusDatas = [[${@dict.getType('useStatus')}]]; var userName = [[${@permission.getPrincipalProperty('userName')}]]; var loginName = [[${@permission.getPrincipalProperty('loginName')}]]; + var customerSignDatas = [[${@dict.getType('sys_customer_sign')}]]; var prefix = ctx + "system/customer"; // 联系人 var prefix1 = ctx + "system/contacts" @@ -539,7 +540,9 @@ {title: '第一收货人电话',field: 'deliveryCustomerPhone',visible: false}, {title: '第一收货人邮编',field: 'deliveryCustomerPostal',visible:false}, {title: '第一收货人传真',field: 'deliveryCustomerFax',visible: false}, - {title: '客户标识',field:'customerSign'}, + {title: '客户标识',field:'customerSign', + formatter: function (value, row, index) {return $.table.selectDictLabel(customerSignDatas, value);} + }, {title: '录入时间',field: 'createTime', sortable: true, formatter: function (value, row, index) { @@ -584,7 +587,15 @@ return actions.join(''); } } - ] + ], + rowStyle: function (row, index) { + if (row.auditStatus=="0") { + // 如果审核状态为待审核,则设置为红色 + return {css:{"color":"red"}}; + } + // 否则使用默认样式 + return {}; + } }; $.table.init(options); $("#customerContact").select2({ @@ -629,7 +640,7 @@ if (res.rows.length > 0) { var usertData = res.rows; for (let i in usertData) { - $("select[name='businessMembers']").append(""); + $("select[name='businessMembers']").append(""); } } else { $.modal.msgError(res.msg);