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

流水明细，每日消耗时间控件修改

This commit is contained in:
Lenovo 2024-08-08 15:15:14 +08:00
parent 5011872a5c
commit e2d83247f6
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="platform != null and platform != ''"> and platform = #{platform}</if>
<if test="updateType != null and updateType != ''"> and update_type = #{updateType}</if>
<if test="integralUpdateTime != null "> and DATE_FORMAT(Integral_update_time,'%Y-%m-%d') = DATE_FORMAT(#{integralUpdateTime},'%Y-%m-%d')</if>
<if test="integralUpdateTime == null "> and DATE_FORMAT(Integral_update_time,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d')</if>
<if test="agentRemark != null and agentRemark != ''"> and agent_remark = #{agentRemark}</if>
<if test="agentAccount != null">
and account in

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

@ -13,6 +13,7 @@
<el-date-picker clearable
v-model="queryParams.integralUpdateTime"
type="date"
:picker-options="expireTimeOPtion"
value-format="yyyy-MM-dd"
placeholder="请选择变更时间">
</el-date-picker>
@ -132,6 +133,15 @@ export default {
name: "Consume",
data() {
return {
expireTimeOPtion: {
disabledDate(time) {
let curDate = (new Date()).getTime();
let date1 = 16 * 24 * 3600 * 1000;
let date2 = curDate-date1;
return time.getTime() > Date.now()-8.64e7 || time.getTime() < date2;
// return time.getTime() > Date.now() - 8.64e7; //如果没有后面的-8.64e7就是不可以选择今天的
}
},
// 遮罩层
loading: true,
// 选中数组

12
ruoyi-ui/src/views/point/detail/index.vue
View File

@ -5,6 +5,7 @@
<el-date-picker clearable
v-model="queryParams.integralUpdateTime"
type="date"
:picker-options="expireTimeOPtion"
value-format="yyyy-MM-dd"
placeholder="请选择变更时间">
</el-date-picker>
@ -174,6 +175,15 @@ export default {
dicts: ['bus_score_type'],
data() {
return {
expireTimeOPtion: {
disabledDate(time) {
let curDate = (new Date()).getTime();
let date1 = 16 * 24 * 3600 * 1000;
let date2 = curDate-date1;
return time.getTime() > Date.now()-8.64e7 || time.getTime() < date2;
// return time.getTime() > Date.now() - 8.64e7; //如果没有后面的-8.64e7就是不可以选择今天的
}
},
// 遮罩层
loading: true,
// 选中数组
@ -200,7 +210,7 @@ export default {
platform: null,
updateType: null,
integralUpdateNum: null,
integralUpdateTime: null,
integralUpdateTime: new Date(),
integralBalance: null,
agentRemark: null,
},