diff --git a/src/views/accessStrategy/editStrategy.vue b/src/views/accessStrategy/editStrategy.vue index b256978..2810d53 100644 --- a/src/views/accessStrategy/editStrategy.vue +++ b/src/views/accessStrategy/editStrategy.vue @@ -37,7 +37,7 @@ v-model.trim="strategyForm.beginDatetime" :disabled="isReadMode" type="datetime" - value-format="yyyy-MM-dd hh:mm:ss" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择生效时间"/> @@ -49,7 +49,7 @@ v-model.trim="strategyForm.endDatetime" :disabled="isReadMode" type="datetime" - value-format="yyyy-MM-dd hh:mm:ss" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择失效时间"/> @@ -269,6 +269,21 @@ return false } } + if (strategyForm.beginTime && strategyForm.endTime) { + const tmpDate1 = '2020-01-01 ' + strategyForm.beginTime + const tmpDate2 = '2020-01-01 ' + strategyForm.endTime + + if (new Date(tmpDate1) > new Date(tmpDate2)) { + this.$message.warning('生效时间不能大于失效时间') + return false + } + } + if (strategyForm.beginDatetime && strategyForm.endDatetime) { + if (new Date(strategyForm.beginDatetime) > new Date(strategyForm.endDatetime)) { + this.$message.warning('生效时间不能大于失效时间') + return false + } + } return true }, // 新增数据 @@ -276,9 +291,9 @@ if (this.validateForm(this.strategyForm)) { // 将星期列表转为字符串 const strategyForm = this.strategyForm - strategyForm.week = strategyForm.week.join(',') this.$refs['dataForm'].validate((valid) => { if (valid) { + strategyForm.week = strategyForm.week.join(',') addStrategy(strategyForm).then(response => { if (response.code === 200) { this.$confirm('新增成功,是否继续新增?', '提示', { @@ -305,9 +320,9 @@ if (this.validateForm(this.strategyForm)) { // 将星期列表转为字符串 const strategyForm = this.strategyForm - strategyForm.week = strategyForm.week.join(',') this.$refs['dataForm'].validate((valid) => { if (valid) { + strategyForm.week = strategyForm.week.join(',') updateStrategy(strategyForm).then(response => { if (response.code === 200) { this.$message.success('修改成功')