Merge remote-tracking branch 'origin/main'

This commit is contained in:
cun-nan 2024-09-25 16:56:53 +08:00
commit 734e0223ed

View File

@ -688,13 +688,14 @@
<el-radio :label="'0'">永久</el-radio>
<el-radio :label="'1'">自定义</el-radio>
</el-radio-group>
<el-date-picker
v-model="form2.suitDateFront"
style="width: 160px"
style="width: 160px;margin-left: 10px;"
type="date"
placeholder="开始日期">
</el-date-picker>
<div style="margin: 0 10px;"></div>
<el-date-picker
v-model="form2.suitDateAfter"
style="width: 160px"
@ -711,13 +712,15 @@
</el-radio-group>
</el-form-item>
<el-form-item v-if="form2.availableOrUn == '0'" label="适用时间段" prop="suitTimeSlotType">
<div>
<div style="width: 100px;margin-top: 10px">
<el-radio-group v-model="form2.suitTimeSlotType">
<el-radio :label="'1'">每周
<div style="display: flex; width: 500px;margin-bottom: 15px;">
<el-radio :label="'1'">每周</el-radio>
<el-checkbox-group v-model="weekDay" style="margin-left: 20px" :disabled="form2.suitTimeSlotType!='1'">
<el-checkbox v-for="(item,index) in weekList" :key="index" :label="item"></el-checkbox>
</el-checkbox-group>
</el-radio>
<el-checkbox v-for="(item,index) in weekList" :key="index" :label="item"></el-checkbox>
</el-checkbox-group>
</div>
<el-radio :label="'2'">每月
<el-select :disabled="form2.suitTimeSlotType!='2'" v-model="monthDay" placeholder="请选择每月固定日期" multiple style="margin-left: 20px">
<el-option
@ -750,8 +753,6 @@
</el-form-item>
<el-form-item v-else label="不适用时间段" prop="noUseTimeType">
<div>
<el-radio-group v-model="form2.noUseTimeType">
<el-radio :label="'1'">每周
<el-checkbox-group v-model="weekDay1" style="margin-left: 20px" :disabled="form2.noUseTimeType!='1'">