From dda6143d99925035928ef72deb24e9f6193a3560 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 27 九月 2023 16:50:38 +0800
Subject: [PATCH] 使用固定数据基本实现看板设备拖拽功能

---
 src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
index a14070b..adac88d 100644
--- a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
+++ b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue
@@ -6,10 +6,10 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date :show-time="{minuteStep:5,hideDisabledOptions:true}" date-format="YYYY-MM-DD HH:mm:ss"
+              <j-date :show-time="{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>
+                      :disabledTime="disabledDateTime" :showToday="false"></j-date>
             </a-form-item>
 
           </a-col>
@@ -23,11 +23,11 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date :show-time="{minuteStep:5,hideDisabledOptions:true}" date-format="YYYY-MM-DD HH:mm:ss"
+              <j-date :show-time="{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>
+                      :disabledTime="disabledDateTime" :showToday="false"></j-date>
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -171,7 +171,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) {

--
Gitblit v1.9.3