zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of http://117.33.142.185:3000/zenghuapei/cyywl_server into test

pull/16/head^2
TianYu 2023-06-08 16:42:32 +08:00
parent ff0c287110 46230f3bcb
commit 14d89110a4
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/promoter/vo/PromoterPageReqVO.java
View File

@ -24,6 +24,7 @@ public class PromoterPageReqVO extends PageParam {
@Schema(description = "推广员手机号", example = "15601691300")
private String mobile;
private String sourceType;
/**
* 帐号状态

4
yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/promoter/PromoterMapper.xml
View File

@ -10,7 +10,7 @@
-->
<select id="findListPage" resultType="cn.iocoder.yudao.module.member.controller.admin.promoter.vo.PromoterRespVO">
select a.id,a.user_id,a.dept_id,b.nickname,b.status,b.mobile,c.parent_organization_name as 'orgName' from member_promoter a
select a.id,a.user_id,a.dept_id,b.nickname,b.status,b.mobile,c.parent_organization_name as 'orgName',a.source_type from member_promoter a
left join member_user b on a.user_id = b.id
left join system_dept c on c.id=a.dept_id
<where>
@ -27,7 +27,7 @@
and b.mobile like CONCAT('%',#{data.mobile},'%')
</if>
<if test="data.sourceType!=null">
and b.source_type =#{data.sourceType}
and a.source_type =#{data.sourceType}
</if>
</where>
</select>

13
yudao-ui-admin/src/views/member/promoter/index.vue
View File

@ -2,7 +2,7 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
<el-form-item label="所属组织" prop="deptId">
<treeselect style="width: 240px;" v-model="queryParams.deptId" :options="deptOptions" :show-count="true"
:clearable="false"
@ -17,6 +17,12 @@
<el-form-item label="推广员名称" prop="nickname">
<el-input v-model="queryParams.nickname" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="注册来源" prop="sourceType">
<el-select v-model="queryParams.sourceType" placeholder="请选择来源" clearable @keyup.enter.native="handleQuery">
<el-option :value="1" label="后台注册"/>
<el-option :value="2" label="扫码注册"/>
</el-select>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input v-model="queryParams.mobile" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
@ -50,6 +56,11 @@
<el-table-column label="编号" align="center" prop="id"/>
<el-table-column label="推广员名称" align="center" prop="nickname"/>
<el-table-column label="手机号" align="center" prop="mobile"/>
<el-table-column label="注册来源" align="center" prop="sourceType">
<template v-slot="scope">
<div>{{scope.row.sourceType == 1?'后台注册':'扫码注册'}}</div>
</template>
</el-table-column>
<el-table-column label="所属组织" align="center" prop="orgName"/>
<el-table-column label="启用状态" align="center" prop="status">
<template v-slot="scope">