From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
index fd2c967..538504e 100644
--- a/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
+++ b/src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
@@ -136,6 +136,30 @@
},
],
},
+ noplanType:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨绫诲瀷"
+ },
+ ],
+ },
+ startTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨寮�濮嬫椂闂�"
+ },
+ ],
+ },
+ endTime:{
+ rules:[
+ {
+ required:true,
+ message: "璇烽�夋嫨缁撴潫鏃堕棿"
+ },
+ ],
+ },
// mdcRepairType:{
// rules:[
// {
@@ -260,7 +284,12 @@
let startOne = start.replace(/:/g,'');
let endOne = end.replace(/:/g,'');
if(startOne>=endOne){
- that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ // that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"
+ });
+
// console.log(this.model)
// this.endTime = ''
that.confirmLoading = false
@@ -275,11 +304,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