|
|
@@ -174,13 +174,29 @@
|
|
|
<div style="background-color: #fbfbfb;padding: 10px; border: 1px solid #e6e6e6; margin-bottom: 10px;">
|
|
|
<el-form ref="rulesTagsFrom" :rules="rulesTagsRules" :model="item" >
|
|
|
<div>
|
|
|
+ <el-form-item label="执行规则" prop="dayOrWeek" style="width: 500px;margin:5px 0 0 8%">
|
|
|
+ <el-radio-group v-model="item.dayOrWeek">
|
|
|
+ <el-radio :label="0">星期</el-radio>
|
|
|
+ <el-radio :label="1">日期</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
<div style="display: flex; align-items: center; flex-wrap: nowrap;">
|
|
|
<span style="margin-right: 10px;">规则 {{ index + 1 }}:</span>
|
|
|
- <el-form-item label="为每:" prop="week" style="flex: 8;margin-bottom: 0">
|
|
|
+ <el-form-item label="为每:" prop="week" style="flex: 8;margin-bottom: 0" v-if="item.dayOrWeek == 0">
|
|
|
<el-select v-model="item.week" remote multiple placeholder="请选择时间" filterable style="width: 350px;">
|
|
|
<el-option v-for="dict in weekOptions" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="为每:" prop="days" style="flex: 8;margin-bottom: 0" v-if="item.dayOrWeek == 1">
|
|
|
+ <el-date-picker
|
|
|
+ clearable size="small"
|
|
|
+ v-model="item.days"
|
|
|
+ type="daterange"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item prop="startTime" style="margin:0 5px 0 5px">
|
|
|
<el-time-select style="width: 120px;" placeholder="起始时间" v-model="item.startTime" :picker-options="{
|
|
|
start: '00:00',
|
|
|
@@ -523,7 +539,7 @@ export default {
|
|
|
// 遍历 tagListFormIndex 并将 tagId 放入对应位置的 tags
|
|
|
newList.forEach((tags, index) => {
|
|
|
if (!this.form.rulesTags[index]) {
|
|
|
- this.$set(this.form.rulesTags, index, {tags:[],week:[1,2,3,4,5,6,7],startTime:null,endTime:null,remarks:null});
|
|
|
+ this.$set(this.form.rulesTags, index, {tags:[],week:[1,2,3,4,5,6,7],startTime:null,endTime:null,remarks:null,dayOrWeek:0,days:null});
|
|
|
}
|
|
|
|
|
|
// 确保清空原来的 tags 数组
|
|
|
@@ -726,7 +742,7 @@ export default {
|
|
|
if (this.form.rulesTags.length >=7) {
|
|
|
return this.$message.error('当前规则已达上限,无法添加规则');
|
|
|
}
|
|
|
- this.form.rulesTags.push({tags:[],week:[1,2,3,4,5,6,7],startTime:null,endTime:null,remarks:null})
|
|
|
+ this.form.rulesTags.push({tags:[],week:[1,2,3,4,5,6,7],startTime:null,endTime:null,remarks:null,dayOrWeek:0,days:null})
|
|
|
},
|
|
|
|
|
|
//选择标签弹窗
|
|
|
@@ -814,7 +830,7 @@ export default {
|
|
|
createName: null,
|
|
|
applyUsers: null,
|
|
|
ruleName: null,
|
|
|
- rulesTags: [{tags:[],week:[1,2,3,4,5,6,7],startTime:null,endTime:null,remarks:null}],
|
|
|
+ rulesTags: [{tags:[],week:[1,2,3,4,5,6,7],startTime:null,endTime:null,remarks:null,dayOrWeek:0,days:null}],
|
|
|
totalNumTags: null,
|
|
|
numTagsTaday: null,
|
|
|
isApply: null,
|
|
|
@@ -828,7 +844,7 @@ export default {
|
|
|
this.tagListFormIndex=[];
|
|
|
|
|
|
//规则
|
|
|
- this.form.rulesTags=[{tags:[],week:[1,2,3,4,5,6,7],startTime:null,endTime:null,remarks:null}];
|
|
|
+ this.form.rulesTags=[{tags:[],week:[1,2,3,4,5,6,7],startTime:null,endTime:null,remarks:null,dayOrWeek:0,days:null}];
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
/** 搜索按钮操作 */
|