From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue b/src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue
index 48331f2..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) {
@@ -461,11 +463,11 @@
this.checked = e.target.checked
},
range(start, end) {
- const result = [];
+ const result = []
for (let i = start; i < end; i++) {
- result.push(i);
+ result.push(i)
}
- return result;
+ return result
},
/**
* 绂佺敤鏃ユ湡閫夋嫨鍣ㄤ腑鐨勬椂闂撮�夋嫨
@@ -473,7 +475,7 @@
*/
disabledDateTime() {
return {
- disabledSeconds: () => this.range(1,60)
+ disabledSeconds: () => this.range(1, 60)
}
}
}
@@ -499,4 +501,6 @@
.ant-tabs-content .ant-form-item {
margin-bottom: 0px;
}
+
+
</style>
--
Gitblit v1.9.3