CN-858 fix: 报告任务时间设置可编辑
This commit is contained in:
@@ -19,7 +19,6 @@
|
|||||||
v-model="editObject.config.timeConfig.type"
|
v-model="editObject.config.timeConfig.type"
|
||||||
class="right-box__select"
|
class="right-box__select"
|
||||||
collapse-tags
|
collapse-tags
|
||||||
:disabled="!!editObject.id"
|
|
||||||
placeholder=" "
|
placeholder=" "
|
||||||
popper-class="right-box-select-dropdown right-box-select-report "
|
popper-class="right-box-select-dropdown right-box-select-report "
|
||||||
size="small"
|
size="small"
|
||||||
@@ -31,7 +30,6 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
<template v-if="editObject.config.timeConfig.type === 'this'">
|
<template v-if="editObject.config.timeConfig.type === 'this'">
|
||||||
<el-select id="reportBoxTimeUnitSelect"
|
<el-select id="reportBoxTimeUnitSelect"
|
||||||
:disabled="!!editObject.id"
|
|
||||||
v-model="editObject.config.timeConfig.unit"
|
v-model="editObject.config.timeConfig.unit"
|
||||||
class="right-box__select"
|
class="right-box__select"
|
||||||
collapse-tags
|
collapse-tags
|
||||||
@@ -45,7 +43,7 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</template>
|
</template>
|
||||||
<div v-else-if="editObject.config.timeConfig.type === 'last' || editObject.config.timeConfig.type === 'previous'" style="display: flex;">
|
<div v-else-if="editObject.config.timeConfig.type === 'last' || editObject.config.timeConfig.type === 'previous'" style="display: flex;">
|
||||||
<el-input v-model.number="editObject.config.timeConfig.offset" size="small" class="el-input-single" placeholder=" " :disabled="!!editObject.id">
|
<el-input v-model.number="editObject.config.timeConfig.offset" size="small" class="el-input-single" placeholder=" ">
|
||||||
<template #prepend><i @click="timeOffsetHandle('m')" class="cn-icon cn-icon-a-"></i></template>
|
<template #prepend><i @click="timeOffsetHandle('m')" class="cn-icon cn-icon-a-"></i></template>
|
||||||
<template #append><i @click="timeOffsetHandle('p')" class="cn-icon cn-icon-a-1"></i></template>
|
<template #append><i @click="timeOffsetHandle('p')" class="cn-icon cn-icon-a-1"></i></template>
|
||||||
</el-input>
|
</el-input>
|
||||||
@@ -53,7 +51,6 @@
|
|||||||
v-model="editObject.config.timeConfig.unit"
|
v-model="editObject.config.timeConfig.unit"
|
||||||
class="right-box__select right-box__select-single"
|
class="right-box__select right-box__select-single"
|
||||||
collapse-tags
|
collapse-tags
|
||||||
:disabled="!!editObject.id"
|
|
||||||
placeholder=" "
|
placeholder=" "
|
||||||
popper-class="right-box-select-dropdown el-select-last"
|
popper-class="right-box-select-dropdown el-select-last"
|
||||||
size="small"
|
size="small"
|
||||||
@@ -73,7 +70,6 @@
|
|||||||
v-model="editObject.config.startTime"
|
v-model="editObject.config.startTime"
|
||||||
size="small"
|
size="small"
|
||||||
:format="dateFormat"
|
:format="dateFormat"
|
||||||
:disabled="!!editObject.id"
|
|
||||||
:disabled-date="startDisabledDate"
|
:disabled-date="startDisabledDate"
|
||||||
@change="startTimeChang"
|
@change="startTimeChang"
|
||||||
prefix-icon="cn-icon cn-icon-shijian"
|
prefix-icon="cn-icon cn-icon-shijian"
|
||||||
@@ -92,7 +88,6 @@
|
|||||||
v-model="editObject.config.endTime"
|
v-model="editObject.config.endTime"
|
||||||
size="small"
|
size="small"
|
||||||
:format="dateFormat"
|
:format="dateFormat"
|
||||||
:disabled="!!editObject.id"
|
|
||||||
:disabled-date="endDisabledDate"
|
:disabled-date="endDisabledDate"
|
||||||
@change="endTimeChange"
|
@change="endTimeChange"
|
||||||
prefix-icon="cn-icon cn-icon-shijian"
|
prefix-icon="cn-icon cn-icon-shijian"
|
||||||
@@ -103,41 +98,41 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-form-item >
|
</el-form-item >
|
||||||
<el-form-item class="el-height">
|
<el-form-item class="el-height">
|
||||||
<el-checkbox v-model="scheduleChecked" :disabled="editObject.config.timeConfig.type === 'customize' || !!editObject.id" :label="$t('report.enableTimeSchedule')" size="large" />
|
<el-checkbox v-model="scheduleChecked" :disabled="editObject.config.timeConfig.type === 'customize'" :label="$t('report.enableTimeSchedule')" size="large" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!--Enable time schedule-->
|
<!--Enable time schedule-->
|
||||||
<el-form-item prop="enableTimeSchedule" v-if="scheduleChecked">
|
<el-form-item prop="enableTimeSchedule" v-if="scheduleChecked">
|
||||||
<div class="enable-tab">
|
<div class="enable-tab">
|
||||||
<div class="enable-tabs" @click="editObject.id ? null : (scheduleType = type.value)" v-for="type in scheduleTypeList" :key="type.value" :class="{'active': scheduleType === type.value, 'disable': editObject.id}">{{$t(type.name)}}</div>
|
<div class="enable-tabs" @click="scheduleTypeChange(type.value)" v-for="type in scheduleTypeList" :key="type.value" :class="{'active': scheduleType === type.value}">{{$t(type.name)}}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="enable-tabs-daily" v-if="scheduleType === scheduleTypeList[0].value">
|
<div class="enable-tabs-daily" v-if="scheduleType === scheduleTypeList[0].value">
|
||||||
<div class="enable-tabs-custom">{{$t('report.customEvery')}}</div>
|
<div class="enable-tabs-custom">{{$t('report.customEvery')}}</div>
|
||||||
<el-input v-model.number="editObject.config.schedulerConfig.interval" size="small" placeholder=" " style="margin-top: 0.3125rem;" :disabled="!!editObject.id">
|
<el-input v-model.number="editObject.config.schedulerConfig.interval" size="small" placeholder=" " style="margin-top: 0.3125rem;">
|
||||||
<template #append>{{$t('report.day')}}</template>
|
<template #append>{{$t('report.day')}}</template>
|
||||||
</el-input>
|
</el-input>
|
||||||
</div>
|
</div>
|
||||||
<div class="enable-tabs-weekly" v-else-if="scheduleType === scheduleTypeList[1].value" :disabled="!!editObject.id">
|
<div class="enable-tabs-weekly" v-else-if="scheduleType === scheduleTypeList[1].value">
|
||||||
<!-- 每隔几周暂时隐藏 -->
|
<!-- 每隔几周暂时隐藏 -->
|
||||||
<!-- <div class="enable-tabs-custom">{{$t('report.customEvery')}}</div>
|
<!-- <div class="enable-tabs-custom">{{$t('report.customEvery')}}</div>
|
||||||
<el-input v-model="editObject.config.schedulerConfig.interval" size="small" placeholder="Please input">
|
<el-input v-model="editObject.config.schedulerConfig.interval" size="small" placeholder="Please input">
|
||||||
<template #append>{{$t('report.week')}}</template>
|
<template #append>{{$t('report.week')}}</template>
|
||||||
</el-input>-->
|
</el-input>-->
|
||||||
<el-checkbox-group v-model="editObject.config.schedulerConfig.weekDates" style="margin-top: 0.3125rem" :disabled="!!editObject.id">
|
<el-checkbox-group v-model="editObject.config.schedulerConfig.weekDates" style="margin-top: 0.3125rem">
|
||||||
<el-checkbox v-for="(item, index) in weekdayList" :key="index" :label="item.value">{{$t(item.name)}}</el-checkbox>
|
<el-checkbox v-for="(item, index) in weekdayList" :key="index" :label="item.value">{{$t(item.name)}}</el-checkbox>
|
||||||
</el-checkbox-group>
|
</el-checkbox-group>
|
||||||
</div>
|
</div>
|
||||||
<!-- 月 -->
|
<!-- 月 -->
|
||||||
<div class="enable-tabs-per-month" v-else-if="scheduleType === scheduleTypeList[2].value">
|
<div class="enable-tabs-per-month" v-else-if="scheduleType === scheduleTypeList[2].value">
|
||||||
<div class="enable-month-tab">
|
<div class="enable-month-tab">
|
||||||
<div class="enable-month-tabs" @click="editObject.id ? null : (monthScheduleType = 'daily')" :class="{'active': monthScheduleType === 'daily', 'disable': editObject.id}">{{$t('report.date')}}</div>
|
<div class="enable-month-tabs" @click="monthScheduleType = 'daily'" :class="{'active': monthScheduleType === 'daily'}">{{$t('report.date')}}</div>
|
||||||
<div class="enable-month-tabs" @click="editObject.id ? null : (monthScheduleType = 'weekly')" :class="{'active': monthScheduleType === 'weekly', 'disable': editObject.id}">{{$t('report.week')}}</div>
|
<div class="enable-month-tabs" @click="monthScheduleType = 'weekly'" :class="{'active': monthScheduleType === 'weekly'}">{{$t('report.week')}}</div>
|
||||||
<el-checkbox v-model="monthIsCycle" :label="$t('report.cycle')" size="large" :disabled="!!editObject.id"/>
|
<el-checkbox v-model="monthIsCycle" :label="$t('report.cycle')" size="large"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="enable-month-data-tab">
|
<div class="enable-month-data-tab">
|
||||||
<!-- 自定义月,循环 -->
|
<!-- 自定义月,循环 -->
|
||||||
<template v-if="monthIsCycle">
|
<template v-if="monthIsCycle">
|
||||||
<div class="enable-tabs-custom">{{$t('report.customEvery')}}</div>
|
<div class="enable-tabs-custom">{{$t('report.customEvery')}}</div>
|
||||||
<el-input v-model="editObject.config.schedulerConfig.interval" size="small" placeholder=" " style="margin-top: 0.3125rem;" :disabled="!!editObject.id">
|
<el-input v-model="editObject.config.schedulerConfig.interval" size="small" placeholder=" " style="margin-top: 0.3125rem;">
|
||||||
<template #append>{{$t('report.month')}}</template>
|
<template #append>{{$t('report.month')}}</template>
|
||||||
</el-input>
|
</el-input>
|
||||||
</template>
|
</template>
|
||||||
@@ -145,8 +140,8 @@
|
|||||||
<template v-else>
|
<template v-else>
|
||||||
<div class="enable-month-moon-custom">{{$t('report.custom')}}</div>
|
<div class="enable-month-moon-custom">{{$t('report.custom')}}</div>
|
||||||
<div class="enable-month-all">
|
<div class="enable-month-all">
|
||||||
<el-checkbox v-model="monthCheckedAll" class="enable-month-all-months" :indeterminate="monthIsIndeterminate" @change="monthCheckAllChange" :label="$t('report.allMonths')" :disabled="!!editObject.id"/>
|
<el-checkbox v-model="monthCheckedAll" class="enable-month-all-months" :indeterminate="monthIsIndeterminate" @change="monthCheckAllChange" :label="$t('report.allMonths')"/>
|
||||||
<el-checkbox-group v-model="editObject.config.schedulerConfig.months" @change="monthCheckChange" :disabled="!!editObject.id">
|
<el-checkbox-group v-model="editObject.config.schedulerConfig.months" @change="monthCheckChange">
|
||||||
<el-checkbox v-for="(item, index) in monthList" :key="index" :label="item.value">{{$t(item.name)}}</el-checkbox>
|
<el-checkbox v-for="(item, index) in monthList" :key="index" :label="item.value">{{$t(item.name)}}</el-checkbox>
|
||||||
</el-checkbox-group>
|
</el-checkbox-group>
|
||||||
</div>
|
</div>
|
||||||
@@ -154,8 +149,8 @@
|
|||||||
<!-- 按日期 -->
|
<!-- 按日期 -->
|
||||||
<template v-if="monthScheduleType === 'daily'">
|
<template v-if="monthScheduleType === 'daily'">
|
||||||
<div class="enable-month-data-tabs">
|
<div class="enable-month-data-tabs">
|
||||||
<el-checkbox v-model="dateCheckedAll" :indeterminate="dateIsIndeterminate" @change="dateCheckAllChange" :label="$t('report.all')" size="large" :disabled="!!editObject.id"/>
|
<el-checkbox v-model="dateCheckedAll" :indeterminate="dateIsIndeterminate" @change="dateCheckAllChange" :label="$t('report.all')" size="large"/>
|
||||||
<el-checkbox-group v-model="editObject.config.schedulerConfig.monthDates" @change="dateCheckChange" :disabled="!!editObject.id">
|
<el-checkbox-group v-model="editObject.config.schedulerConfig.monthDates" @change="dateCheckChange">
|
||||||
<el-checkbox v-for="item in dateList" :key="item" :label="item"/>
|
<el-checkbox v-for="item in dateList" :key="item" :label="item"/>
|
||||||
</el-checkbox-group>
|
</el-checkbox-group>
|
||||||
</div>
|
</div>
|
||||||
@@ -168,7 +163,6 @@
|
|||||||
class="right-box__select"
|
class="right-box__select"
|
||||||
multiple
|
multiple
|
||||||
placeholder=" "
|
placeholder=" "
|
||||||
:disabled="!!editObject.id"
|
|
||||||
popper-class="right-box-select-dropdown right-box-select-report"
|
popper-class="right-box-select-dropdown right-box-select-report"
|
||||||
size="small"
|
size="small"
|
||||||
@change="()=>{ this.$forceUpdate() }">
|
@change="()=>{ this.$forceUpdate() }">
|
||||||
@@ -177,8 +171,8 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-select>
|
</el-select>
|
||||||
<div class="enable-month-week">
|
<div class="enable-month-week">
|
||||||
<el-checkbox v-model="monthWeekdayCheckedAll" class="enable-month-week-all" :label="$t('report.all')" :indeterminate="monthWeekdayIsIndeterminate" @change="monthWeekdayCheckAllChange" size="large" :disabled="!!editObject.id"/>
|
<el-checkbox v-model="monthWeekdayCheckedAll" class="enable-month-week-all" :label="$t('report.all')" :indeterminate="monthWeekdayIsIndeterminate" @change="monthWeekdayCheckAllChange" size="large"/>
|
||||||
<el-checkbox-group v-model="editObject.config.schedulerConfig.weekDates" @change="monthWeekdayCheckChange" :disabled="!!editObject.id">
|
<el-checkbox-group v-model="editObject.config.schedulerConfig.weekDates" @change="monthWeekdayCheckChange">
|
||||||
<el-checkbox v-for="(item, index) in weekdayList" :key="index" :label="item.value">{{$t(item.name)}}</el-checkbox>
|
<el-checkbox v-for="(item, index) in weekdayList" :key="index" :label="item.value">{{$t(item.name)}}</el-checkbox>
|
||||||
</el-checkbox-group>
|
</el-checkbox-group>
|
||||||
</div>
|
</div>
|
||||||
@@ -228,7 +222,7 @@
|
|||||||
:disabled="!!editObject.id"
|
:disabled="!!editObject.id"
|
||||||
popper-class="right-box-select-dropdown right-box-select-report"
|
popper-class="right-box-select-dropdown right-box-select-report"
|
||||||
size="small"
|
size="small"
|
||||||
@change="typeChange">
|
>
|
||||||
<template v-for="category in categoryList" :key="category.id">
|
<template v-for="category in categoryList" :key="category.id">
|
||||||
<el-option :label="category.name" :value="category.id"></el-option>
|
<el-option :label="category.name" :value="category.id"></el-option>
|
||||||
</template>
|
</template>
|
||||||
@@ -413,20 +407,14 @@ export default {
|
|||||||
watch: {
|
watch: {
|
||||||
scheduleType (n, o) {
|
scheduleType (n, o) {
|
||||||
this.editObject.config.schedulerConfig.type = n
|
this.editObject.config.schedulerConfig.type = n
|
||||||
if (!this.editObject.id) {
|
this.cleanScheduleConfig()
|
||||||
this.cleanScheduleConfig()
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
scheduleChecked (n) {
|
scheduleChecked (n) {
|
||||||
this.editObject.config.isScheduler = n ? 1 : 0
|
this.editObject.config.isScheduler = n ? 1 : 0
|
||||||
if (!this.editObject.id) {
|
this.cleanScheduleConfig()
|
||||||
this.cleanScheduleConfig()
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
monthScheduleType (n) {
|
monthScheduleType (n) {
|
||||||
if (!this.editObject.id) {
|
this.cleanScheduleConfig()
|
||||||
this.cleanScheduleConfig()
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
monthIsCycle (n) {
|
monthIsCycle (n) {
|
||||||
if (!this.editObject.id) {
|
if (!this.editObject.id) {
|
||||||
@@ -560,15 +548,13 @@ export default {
|
|||||||
this.editObject.config.timeConfig.offset--
|
this.editObject.config.timeConfig.offset--
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
|
||||||
typeChange (id) {
|
|
||||||
|
|
||||||
},
|
},
|
||||||
cleanScheduleConfig () {
|
cleanScheduleConfig () {
|
||||||
this.editObject.config.schedulerConfig.monthDates = []
|
this.editObject.config.schedulerConfig.monthDates = []
|
||||||
this.editObject.config.schedulerConfig.weekDates = []
|
this.editObject.config.schedulerConfig.weekDates = []
|
||||||
this.editObject.config.schedulerConfig.months = []
|
this.editObject.config.schedulerConfig.months = []
|
||||||
this.editObject.config.schedulerConfig.monthWeekDates = []
|
this.editObject.config.schedulerConfig.monthWeekDates = []
|
||||||
|
this.editObject.config.schedulerConfig.interval = 1
|
||||||
this.monthIsCycle = true
|
this.monthIsCycle = true
|
||||||
this.dateCheckedAll = false
|
this.dateCheckedAll = false
|
||||||
this.dateIsIndeterminate = false
|
this.dateIsIndeterminate = false
|
||||||
@@ -582,6 +568,9 @@ export default {
|
|||||||
this.scheduleChecked = false
|
this.scheduleChecked = false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
scheduleTypeChange (val) {
|
||||||
|
this.scheduleType = val
|
||||||
|
},
|
||||||
save () {
|
save () {
|
||||||
if (this.blockOperation.save) { return }
|
if (this.blockOperation.save) { return }
|
||||||
this.blockOperation.save = true
|
this.blockOperation.save = true
|
||||||
|
|||||||
Reference in New Issue
Block a user