wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

页面统计排序、去掉页面多余按钮

This commit is contained in:
Ryan 2024-08-20 18:30:34 +08:00
parent b427f4be8b
commit ef81b36de6
6 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml
View File

@ -92,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP BY Bind_User
) c
on a.agent_account = c.Bind_User
ORDER BY account ASC
</select>
<select id="selectBusAgentInfoList" parameterType="BusAgentInfo" resultMap="BusAgentInfoResult">
@ -113,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="delStatus != null and delStatus != ''"> and del_status = #{delStatus}</if>
</where>
ORDER BY agent_account ASC
</select>
<select id="selectBusAgentInfoById" parameterType="Long" resultMap="BusAgentInfoResult">

1
ruoyi-system/src/main/resources/mapper/business/BusIntegralHistoryInfoMapper.xml
View File

@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="account != null and account != ''"> and account = #{account}</if>
<if test="expStartTime != null and expEndTime != null"> and create_time between #{expStartTime} and #{expEndTime}</if>
</where>
ORDER BY account ASC
</select>
<insert id="insertBusIntegralHistoryInfo" parameterType="BusIntegralHistoryInfo" useGeneratedKeys="true" keyProperty="id">

4
ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml
View File

@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="account != null and account != ''"> and account = #{account}</if>
</where>
GROUP BY DATE_FORMAT(Integral_update_time,'%Y-%m-%d'),account,platform
ORDER BY DATE_FORMAT(Integral_update_time,'%Y-%m-%d') desc
ORDER BY DATE_FORMAT(Integral_update_time,'%Y-%m-%d') desc, account ASC
</select>
<select id="selectBusIntegralRecordListA" parameterType="BusIntegralRecord" resultMap="BusIntegralRecordResult">
@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</if>
</where>
ORDER BY Integral_update_time desc
ORDER BY DATE_FORMAT(Integral_update_time,'%Y-%m-%d') desc, account ASC
</select>
<select id="selectBusIntegralRecordById" parameterType="Long" resultMap="BusIntegralRecordResult">
<include refid="selectBusIntegralRecordVo"/>

10
ruoyi-ui/src/views/agent/list/index.vue
View File

@ -84,22 +84,22 @@
</template>
</el-table-column>
<el-table-column label="代理商编码" align="center" prop="id" />
<el-table-column label="代理人账号" align="center" prop="agentAccount" />
<el-table-column label="代理人姓名" align="center" prop="agentName" />
<el-table-column label="代理人账号" align="center" prop="agentAccount" width="110"/>
<el-table-column label="代理人姓名" align="center" prop="agentName" width="110"/>
<el-table-column label="上级代理商编码" align="center" prop="superiorAgentCode" />
<el-table-column label="上级代理商账号" align="center" prop="superiorAgentAccount" />
<el-table-column label="上级代理商账号" align="center" prop="superiorAgentAccount" width="110"/>
<el-table-column label="授权店铺数" align="center" prop="grantStoreNum" />
<el-table-column label="运营店铺数" align="center" prop="operateStoreNum" />
<el-table-column label="昨日消耗积分数" align="center" prop="lastUseIntegralNum" />
<el-table-column label="昨日好评量" align="center" prop="lastPositiveReviewsNum" />
<el-table-column label="安全营销余额" align="center" prop="aiDurationBalance" />
<el-table-column label="普通营销余额" align="center" prop="aiRealTimeNum" />
<el-table-column label="上次登录时间" align="center" prop="lastLoginTime" width="180">
<el-table-column label="上次登录时间" align="center" prop="lastLoginTime" width="100">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.lastLoginTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="上次登录ip" align="center" prop="lastLoginIp" />
<el-table-column label="上次登录ip" align="center" prop="lastLoginIp" width="130"/>
<el-table-column label="登录次数" align="center" prop="loginNum" />
<!-- <el-table-column label="删除状态" align="center" prop="delStatus" /> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">

15
ruoyi-ui/src/views/point/consume/index.vue
View File

@ -21,10 +21,17 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
@ -34,7 +41,7 @@
@click="handleAdd"
v-hasPermi="['system:record:add']"
>新增</el-button>
</el-col>
</el-col> -->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
@ -57,7 +64,7 @@
<!-- v-hasPermi="['system:record:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@ -68,7 +75,7 @@
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</el-row> -->
<el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />

4
ruoyi-ui/src/views/statistics/excellence/index.vue
View File

@ -15,7 +15,7 @@
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
@ -59,7 +59,7 @@
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</el-row> -->
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />