From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
index 765e195..77685af 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
@@ -44,20 +44,22 @@
<a-row :gutter="24">
<a-col :span="12">
<a-form-item label="寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-date :show-time="{defaultValue:moment('08:00:00','HH:mm:ss'),minuteStep:5,hideDisabledOptions:true}"
+ <j-date :show-time="{defaultValue:moment('08:00:00','HH:mm:ss'),hideDisabledOptions:true}"
date-format="YYYY-MM-DD HH:mm:ss"
placeholder="璇烽�夋嫨寮�濮嬫椂闂�"
:disabledDate="disabledDate" class="query-group-cust"
- v-decorator="['startTime', validatorRules.startTime]" :disabledTime="disabledDateTime"></j-date>
+ v-decorator="['startTime', validatorRules.startTime]" :disabledTime="disabledDateTime"
+ :showToday="false"></j-date>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-date :show-time="{defaultValue:moment('08:00:00','HH:mm:ss'),minuteStep:5,hideDisabledOptions:true}"
+ <j-date :show-time="{defaultValue:moment('08:00:00','HH:mm:ss'),hideDisabledOptions:true}"
date-format="YYYY-MM-DD HH:mm:ss"
placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
:disabledDate="disabledDate" class="query-group-cust"
- v-decorator="['endTime', validatorRules.endTime]" :disabledTime="disabledDateTime"></j-date>
+ v-decorator="['endTime', validatorRules.endTime]" :disabledTime="disabledDateTime"
+ :showToday="false"></j-date>
</a-form-item>
</a-col>
</a-row>
@@ -226,7 +228,7 @@
disabledDate(current) {
//Can not slect days before today and today
// return current && current < moment().endOf("day");
- return current < moment().subtract(+2, 'day')//鍓嶄竴澶╀箣鍓嶇殑骞存湀鏃ヤ笉鍙�夛紝涓嶅寘鎷墠涓�澶�
+ return current < moment().subtract(+2, 'day').endOf('day')//鍓嶄竴澶╀箣鍓嶇殑骞存湀鏃ヤ笉鍙�夛紝涓嶅寘鎷墠涓�澶�
},
moment,
// onChange(dates) {
@@ -460,13 +462,20 @@
checkboxChange(e) {
this.checked = e.target.checked
},
+ range(start, end) {
+ const result = []
+ for (let i = start; i < end; i++) {
+ result.push(i)
+ }
+ return result
+ },
/**
* 绂佺敤鏃ユ湡閫夋嫨鍣ㄤ腑鐨勬椂闂撮�夋嫨
- * @returns {{disabledSeconds: (function(): number[])}}
+ * @returns {{disabledSeconds: (function(): number[])}} 杩斿洖鍊间负涓�涓璞★紝鍙互绂佹灏忔椂銆佸垎閽熴�佺锛岀洰鍓嶄粎绂佹鎵�鏈夌鏁�,鏈�浣庝粠1寮�濮嬶紝浠�0寮�濮嬬‘瀹氭寜閽皢琚鐢�
*/
disabledDateTime() {
return {
- disabledSeconds: () => [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59]
+ disabledSeconds: () => this.range(1, 60)
}
}
}
@@ -492,4 +501,6 @@
.ant-tabs-content .ant-form-item {
margin-bottom: 0px;
}
+
+
</style>
--
Gitblit v1.9.3