From d40667a798f044b979efe6610ffd1cf68471de9c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 08 六月 2022 21:45:44 +0800
Subject: [PATCH] !182 优化新增用户与角色信息、用户与岗位信息逻辑 Merge pull request !182 from zendwang/dev
---
ruoyi-ui/src/components/Crontab/year.vue | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/ruoyi-ui/src/components/Crontab/year.vue b/ruoyi-ui/src/components/Crontab/year.vue
index 16a2b04..5487a6c 100644
--- a/ruoyi-ui/src/components/Crontab/year.vue
+++ b/ruoyi-ui/src/components/Crontab/year.vue
@@ -15,16 +15,16 @@
<el-form-item>
<el-radio :label="3" v-model='radioValue'>
鍛ㄦ湡浠�
- <el-input-number v-model='cycle01' :min='fullYear' /> -
- <el-input-number v-model='cycle02' :min='fullYear' />
+ <el-input-number v-model='cycle01' :min='fullYear' :max="2098" /> -
+ <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : fullYear + 1" :max="2099" />
</el-radio>
</el-form-item>
<el-form-item>
<el-radio :label="4" v-model='radioValue'>
浠�
- <el-input-number v-model='average01' :min='fullYear' /> 骞村紑濮嬶紝姣�
- <el-input-number v-model='average02' :min='fullYear' /> 骞存墽琛屼竴娆�
+ <el-input-number v-model='average01' :min='fullYear' :max="2098"/> 骞村紑濮嬶紝姣�
+ <el-input-number v-model='average02' :min="1" :max="2099 - average01 || fullYear" /> 骞存墽琛屼竴娆�
</el-radio>
</el-form-item>
@@ -67,10 +67,10 @@
this.$emit('update', 'year', '*');
break;
case 3:
- this.$emit('update', 'year', this.cycle01 + '-' + this.cycle02);
+ this.$emit('update', 'year', this.cycleTotal);
break;
case 4:
- this.$emit('update', 'year', this.average01 + '/' + this.average02);
+ this.$emit('update', 'year', this.averageTotal);
break;
case 5:
this.$emit('update', 'year', this.checkboxString);
@@ -97,7 +97,7 @@
}
},
watch: {
- "radioValue": "radioChange",
+ 'radioValue': 'radioChange',
'cycleTotal': 'cycleChange',
'averageTotal': 'averageChange',
'checkboxString': 'checkboxChange'
@@ -105,15 +105,15 @@
computed: {
// 璁＄畻涓や釜鍛ㄦ湡鍊�
cycleTotal: function () {
- this.cycle01 = this.checkNum(this.cycle01, this.fullYear, this.fullYear + 100)
- this.cycle02 = this.checkNum(this.cycle02, this.fullYear + 1, this.fullYear + 101)
- return this.cycle01 + '-' + this.cycle02;
+ const cycle01 = this.checkNum(this.cycle01, this.fullYear, 2098)
+ const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : this.fullYear + 1, 2099)
+ return cycle01 + '-' + cycle02;
},
// 璁＄畻骞冲潎鐢ㄥ埌鐨勫��
averageTotal: function () {
- this.average01 = this.checkNum(this.average01, this.fullYear, this.fullYear + 100)
- this.average02 = this.checkNum(this.average02, 1, 10)
- return this.average01 + '/' + this.average02;
+ const average01 = this.checkNum(this.average01, this.fullYear, 2098)
+ const average02 = this.checkNum(this.average02, 1, 2099 - average01 || this.fullYear)
+ return average01 + '/' + average02;
},
// 璁＄畻鍕鹃�夌殑checkbox鍊煎悎闆�
checkboxString: function () {
@@ -124,6 +124,8 @@
mounted: function () {
// 浠呰幏鍙栧綋鍓嶅勾浠�
this.fullYear = Number(new Date().getFullYear());
+ this.cycle01 = this.fullYear
+ this.average01 = this.fullYear
}
}
</script>
--
Gitblit v1.9.3