|
@@ -15,8 +15,25 @@
|
|
|
<el-form-item>
|
|
|
<el-radio v-model='radioValue' :label="3">
|
|
|
周期从星期
|
|
|
- <el-input-number v-model='cycle01' :min="1" :max="7" /> -
|
|
|
- <el-input-number v-model='cycle02' :min="1" :max="7" />
|
|
|
+ <el-select clearable v-model="cycle01">
|
|
|
+ <el-option
|
|
|
+ v-for="(item,index) of weekList"
|
|
|
+ :key="index"
|
|
|
+ :label="item.value"
|
|
|
+ :value="item.key"
|
|
|
+ :disabled="item.key === 1"
|
|
|
+ >{{item.value}}</el-option>
|
|
|
+ </el-select>
|
|
|
+ -
|
|
|
+ <el-select clearable v-model="cycle02">
|
|
|
+ <el-option
|
|
|
+ v-for="(item,index) of weekList"
|
|
|
+ :key="index"
|
|
|
+ :label="item.value"
|
|
|
+ :value="item.key"
|
|
|
+ :disabled="item.key < cycle01 && item.key !== 1"
|
|
|
+ >{{item.value}}</el-option>
|
|
|
+ </el-select>
|
|
|
</el-radio>
|
|
|
</el-form-item>
|
|
|
|
|
@@ -24,14 +41,18 @@
|
|
|
<el-radio v-model='radioValue' :label="4">
|
|
|
第
|
|
|
<el-input-number v-model='average01' :min="1" :max="4" /> 周的星期
|
|
|
- <el-input-number v-model='average02' :min="1" :max="7" />
|
|
|
+ <el-select clearable v-model="average02">
|
|
|
+ <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
|
|
|
+ </el-select>
|
|
|
</el-radio>
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item>
|
|
|
<el-radio v-model='radioValue' :label="5">
|
|
|
本月最后一个星期
|
|
|
- <el-input-number v-model='weekday' :min="1" :max="7" />
|
|
|
+ <el-select clearable v-model="weekday">
|
|
|
+ <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
|
|
|
+ </el-select>
|
|
|
</el-radio>
|
|
|
</el-form-item>
|
|
|
|
|
@@ -39,7 +60,7 @@
|
|
|
<el-radio v-model='radioValue' :label="6">
|
|
|
指定
|
|
|
<el-select clearable v-model="checkboxList" placeholder="可多选" multiple style="width:100%">
|
|
|
- <el-option v-for="(item,index) of weekList" :key="index" :value="index+1">{{item}}</el-option>
|
|
|
+ <el-option v-for="(item,index) of weekList" :key="index" :label="item.value" :value="item.key">{{item.value}}</el-option>
|
|
|
</el-select>
|
|
|
</el-radio>
|
|
|
</el-form-item>
|
|
@@ -52,13 +73,42 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
radioValue: 2,
|
|
|
- weekday: 1,
|
|
|
- cycle01: 1,
|
|
|
- cycle02: 2,
|
|
|
+ weekday: 2,
|
|
|
+ cycle01: 2,
|
|
|
+ cycle02: 3,
|
|
|
average01: 1,
|
|
|
- average02: 1,
|
|
|
+ average02: 2,
|
|
|
checkboxList: [],
|
|
|
- weekList: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'],
|
|
|
+ weekList: [
|
|
|
+ {
|
|
|
+ key: 2,
|
|
|
+ value: '星期一'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key: 3,
|
|
|
+ value: '星期二'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key: 4,
|
|
|
+ value: '星期三'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key: 5,
|
|
|
+ value: '星期四'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key: 6,
|
|
|
+ value: '星期五'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key: 7,
|
|
|
+ value: '星期六'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key: 1,
|
|
|
+ value: '星期日'
|
|
|
+ }
|
|
|
+ ],
|
|
|
checkNum: this.$options.propsData.check
|
|
|
}
|
|
|
},
|
|
@@ -81,7 +131,7 @@ export default {
|
|
|
this.$emit('update', 'week', this.cycle01 + '-' + this.cycle02);
|
|
|
break;
|
|
|
case 4:
|
|
|
- this.$emit('update', 'week', this.average01 + '#' + this.average02);
|
|
|
+ this.$emit('update', 'week', this.average02 + '#' + this.average01);
|
|
|
break;
|
|
|
case 5:
|
|
|
this.$emit('update', 'week', this.weekday + 'L');
|
|
@@ -135,7 +185,7 @@ export default {
|
|
|
averageTotal: function () {
|
|
|
this.average01 = this.checkNum(this.average01, 1, 4)
|
|
|
this.average02 = this.checkNum(this.average02, 1, 7)
|
|
|
- return this.average01 + '#' + this.average02;
|
|
|
+ return this.average02 + '#' + this.average01;
|
|
|
},
|
|
|
// 最近的工作日(格式)
|
|
|
weekdayCheck: function () {
|