|
@@ -78,9 +78,12 @@
|
|
|
<el-select v-show="item.type === 2 || item.type === 4" v-model="item.triggerEvent" placeholder="请选择" size="small" class="condition-select" :disabled="disabled">
|
|
|
<el-option v-for="key in noticeEventList" :key="'event'+key.code" :label="key.name" :value="key.code" />
|
|
|
</el-select>
|
|
|
- <el-select v-show="item.type === 1 || item.type === 3 || item.type === 5" v-model="item.greaterTime" placeholder="请选择" size="small" class="condition-select" :disabled="disabled">
|
|
|
+ <el-select v-show="item.type === 1 || item.type === 3" v-model="item.greaterTime" placeholder="请选择" size="small" class="condition-select" :disabled="disabled">
|
|
|
<el-option v-for="key in rangDaysList" :key="'greaterTime'+key.value" :label="key.label" :value="key.value" />
|
|
|
</el-select>
|
|
|
+ <el-select v-show="item.type === 5" v-model="item.greaterTime" placeholder="请选择" size="small" class="condition-select" :disabled="disabled">
|
|
|
+ <el-option v-for="key in sDaysList" :key="'s'+key.value" :label="key.label" :value="key.value" />
|
|
|
+ </el-select>
|
|
|
<el-select v-show="item.type === 2 || item.type === 4" v-model="item.lessTime" placeholder="请选择" size="small" class="condition-select" :disabled="disabled">
|
|
|
<el-option v-for="key in aheadDaysList" :key="'lessTime'+key.value" :label="key.label" :value="key.value" />
|
|
|
</el-select>
|
|
@@ -296,6 +299,7 @@ export default {
|
|
|
noticeScheduleOpList: [],
|
|
|
noticeConditionScheduleTypeList: [], // 全周期
|
|
|
rangDaysList: [], // 条件中大于天数列表
|
|
|
+ sDaysList: [],
|
|
|
DaysList: [], // 排期天数
|
|
|
continuityDaysList: [] // 通知时刻频次列表
|
|
|
}
|
|
@@ -545,11 +549,12 @@ export default {
|
|
|
let i = 1
|
|
|
let number = 1
|
|
|
while (number <= 24) {
|
|
|
- number >= 6 ? this.rangDaysList.push({ label: `大于${number}小时`, value: `${number}H` }) : ''
|
|
|
+ number >= 6 ? this.sDaysList.push({ label: `大于${number}小时`, value: `${number}H` }) : ''
|
|
|
number++
|
|
|
}
|
|
|
while (i <= 100) {
|
|
|
- this.rangDaysList.push({ label: `大于${i}天`, value: `${i}D` })
|
|
|
+ this.rangDaysList.push({ label: `大于${i}天`, value: i })
|
|
|
+ this.sDaysList.push({ label: `大于${i}天`, value: `${i}D` })
|
|
|
this.DaysList.push({ label: `${i}天`, value: i })
|
|
|
this.continuityDaysList.push({ label: `连续${i}天`, value: i })
|
|
|
i++
|