流水明细,每日消耗时间控件修改
This commit is contained in:
parent
5011872a5c
commit
e2d83247f6
|
@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="platform != null and platform != ''"> and platform = #{platform}</if>
|
<if test="platform != null and platform != ''"> and platform = #{platform}</if>
|
||||||
<if test="updateType != null and updateType != ''"> and update_type = #{updateType}</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(#{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="agentRemark != null and agentRemark != ''"> and agent_remark = #{agentRemark}</if>
|
||||||
<if test="agentAccount != null">
|
<if test="agentAccount != null">
|
||||||
and account in
|
and account in
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
<el-date-picker clearable
|
<el-date-picker clearable
|
||||||
v-model="queryParams.integralUpdateTime"
|
v-model="queryParams.integralUpdateTime"
|
||||||
type="date"
|
type="date"
|
||||||
|
:picker-options="expireTimeOPtion"
|
||||||
value-format="yyyy-MM-dd"
|
value-format="yyyy-MM-dd"
|
||||||
placeholder="请选择变更时间">
|
placeholder="请选择变更时间">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
|
@ -132,6 +133,15 @@ export default {
|
||||||
name: "Consume",
|
name: "Consume",
|
||||||
data() {
|
data() {
|
||||||
return {
|
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,
|
loading: true,
|
||||||
// 选中数组
|
// 选中数组
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
<el-date-picker clearable
|
<el-date-picker clearable
|
||||||
v-model="queryParams.integralUpdateTime"
|
v-model="queryParams.integralUpdateTime"
|
||||||
type="date"
|
type="date"
|
||||||
|
:picker-options="expireTimeOPtion"
|
||||||
value-format="yyyy-MM-dd"
|
value-format="yyyy-MM-dd"
|
||||||
placeholder="请选择变更时间">
|
placeholder="请选择变更时间">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
|
@ -174,6 +175,15 @@ export default {
|
||||||
dicts: ['bus_score_type'],
|
dicts: ['bus_score_type'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
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,
|
loading: true,
|
||||||
// 选中数组
|
// 选中数组
|
||||||
|
@ -200,7 +210,7 @@ export default {
|
||||||
platform: null,
|
platform: null,
|
||||||
updateType: null,
|
updateType: null,
|
||||||
integralUpdateNum: null,
|
integralUpdateNum: null,
|
||||||
integralUpdateTime: null,
|
integralUpdateTime: new Date(),
|
||||||
integralBalance: null,
|
integralBalance: null,
|
||||||
agentRemark: null,
|
agentRemark: null,
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue