Commit 2a662c47a2d037db1b16d83351d17d237162bf30

Authored by ww
1 parent 4b86efb5

fix: 修复启用规则开始时间能大于结束时间

@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
22 v-model:value="item.startsOn" 22 v-model:value="item.startsOn"
23 value-format="x" 23 value-format="x"
24 format="HH:mm" 24 format="HH:mm"
  25 + @change="handleBlur(item.startsOn, item.endsOn, item)"
25 :disabled="!item.enabled || modalStatus" 26 :disabled="!item.enabled || modalStatus"
26 /> 27 />
27 <span class="ml-4 mr-4 flex items-center">~</span> 28 <span class="ml-4 mr-4 flex items-center">~</span>
@@ -43,6 +44,7 @@ @@ -43,6 +44,7 @@
43 value-format="x" 44 value-format="x"
44 format="HH:mm" 45 format="HH:mm"
45 :disabled="modalStatus" 46 :disabled="modalStatus"
  47 + @change="handleTimeBlur(timeState.startsOn, timeState.endsOn)"
46 /> 48 />
47 <span class="ml-4 mr-4">~</span> 49 <span class="ml-4 mr-4">~</span>
48 <TimePicker 50 <TimePicker
@@ -228,13 +230,13 @@ @@ -228,13 +230,13 @@
228 type: 'ANY_TIME', 230 type: 'ANY_TIME',
229 }); 231 });
230 const handleBlur = (eS, eE, item: Recordable) => { 232 const handleBlur = (eS, eE, item: Recordable) => {
231 - if (eS > eE) { 233 + if (eS && eE && eS > eE) {
232 item?.endsOn && (item.endsOn = null); 234 item?.endsOn && (item.endsOn = null);
233 return createMessage.warn('开始时间不能大于结束时间'); 235 return createMessage.warn('开始时间不能大于结束时间');
234 } 236 }
235 }; 237 };
236 const handleTimeBlur = (eS, eE) => { 238 const handleTimeBlur = (eS, eE) => {
237 - if (eS > eE) { 239 + if (eS && eE && eS > eE) {
238 timeState.endsOn = null; 240 timeState.endsOn = null;
239 return createMessage.warn('开始时间不能大于结束时间'); 241 return createMessage.warn('开始时间不能大于结束时间');
240 } 242 }