From 0a03169b9b9758a926dec35735e989f52e4d217f Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 25 九月 2023 17:46:46 +0800
Subject: [PATCH] 维修休班管理页面按照新需求优化功能 1、编辑机床维修时间的日期选择器选择时间时取消秒针选择以及将分钟选择步距调整为5分钟 2、点击左侧树组件中的具体设备名称后点击新增按钮时可将树组件选择的设备反填到设备组选项中（个人优化将已选择的设备组反选在选择设备弹窗中的多选框中） 3、编辑机床维修时间的日期选择器的可选时间修改为最早可以选到当日前一天，目前为最早选到当日
---
src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue
index e1c5651..4e0393b 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModal.vue
@@ -20,15 +20,18 @@
</a-col>
<a-col :span="12">
<a-form-item label="绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="disableSubmit" placeholder="璇疯緭鍏ョ被鍨�"
- v-decorator="['type', validatorRules.type]"/>
+ <j-dict-select-tag :readOnly="disableSubmit" placeholder="璇烽�夋嫨绫诲瀷"
+ :triggerChange="true" dictCode="vacation_type "
+ v-decorator="['vacationType', validatorRules.vacationType]" allow-clear/>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
+ <a-col :span="24">
<a-form-item label="澶囨敞" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-textarea v-decorator="['notes', validatorRules.notes]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
+ <a-textarea :maxLength="20" v-decorator="['notes', validatorRules.notes]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
</a-form-item>
+ </a-col>
</a-row>
</a-form>
</a-spin>
@@ -109,6 +112,22 @@
},
],
},
+ vacationDate:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨浼戝亣鏃堕棿"
+ },
+ ],
+ },
+ vacationType:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨鍋囨湡绫诲瀷"
+ },
+ ],
+ },
},
url: {
@@ -123,7 +142,6 @@
},
created() {
},
-
methods: {
// disabledDate(current){
// //Can not slect days before today and today
@@ -201,7 +219,7 @@
this.model = Object.assign({}, record)
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'equipmentId', 'equipmentName', 'vacationDate', 'type', 'notes',
+ this.form.setFieldsValue(pick(this.model, 'equipmentId', 'equipmentName', 'vacationDate', 'vacationType', 'notes',
))
})
},
@@ -244,11 +262,19 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("娣诲姞鎴愬姛")
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.success({
+ message:'娑堟伅',
+ description:"娣诲姞鎴愬姛"
+ });
// that.$message.success(res.message)
that.$emit('ok', res.result)
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false
--
Gitblit v1.9.3