From 8e75a78f55d60565eb48b25eafd4eb07939ce2cc Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:05 +0800
Subject: [PATCH] Merge branch 'master' into develop
---
src/views/mdc/base/modules/shift/ShiftInfoModel.vue | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/src/views/mdc/base/modules/shift/ShiftInfoModel.vue b/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
index 8a7d69c..ed99075 100644
--- a/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
+++ b/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
@@ -169,7 +169,11 @@
// }
//update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
}else{
- this.$message.warning(res.message)
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
this.loading = false
@@ -221,7 +225,6 @@
const that = this
// 瑙﹀彂琛ㄥ崟楠岃瘉
this.form.validateFields((err, values) => {
- console.log(values);
if (!err) {
// debugger
that.confirmLoading = true
@@ -234,8 +237,17 @@
let startTimeOne = startTime.replace(/:/g,'');
let endTimeOne = endTime.replace(/:/g,'');
if(startTimeOne>endTimeOne){
- that.$message.warning("闈炶法澶╃彮娆＄粨鏉熸椂闂翠笉鑳藉皬浜庣瓑浜庡紑濮嬫椂闂达紒")
- that.$message.success("淇濆瓨澶辫触")
+ // that.$message.warning("闈炶法澶╃彮娆＄粨鏉熸椂闂翠笉鑳藉皬浜庣瓑浜庡紑濮嬫椂闂达紒")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"闈炶法澶╃彮娆＄粨鏉熸椂闂翠笉鑳藉皬浜庣瓑浜庡紑濮嬫椂闂达紒"
+ });
+ // that.$message.success("淇濆瓨澶辫触")
+ that.$notification.error({
+ message:'娑堟伅',
+ description:"淇濆瓨澶辫触锛�"
+ });
+ that.confirmLoading = false
that.close()
}else{
formData.shiftSubStatus = 1
@@ -249,10 +261,18 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("淇濆瓨鎴愬姛")
+ // that.$message.success("淇濆瓨鎴愬姛")
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"淇濆瓨鎴愬姛"
+ });
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
@@ -271,10 +291,18 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("淇濆瓨鎴愬姛")
+ // that.$message.success
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:"淇濆瓨鎴愬姛"
+ });
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