From 102c7d7dc9f5af873f19c86a0d17d5d6addcbc32 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 19 九月 2023 17:39:28 +0800
Subject: [PATCH] 项目优化
---
src/views/mdc/base/modules/shift/ShiftInfoModel.vue | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/src/views/mdc/base/modules/shift/ShiftInfoModel.vue b/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
index 8a7d69c..1ed89ef 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
@@ -229,13 +232,24 @@
formData.isDaySpan = that.isDaySpan
console.log(formData.isDaySpan);
if(formData.isDaySpan == false){
- let startTime = moment(formData.startDate).format('HH:mm:ss');
- let endTime = moment(formData.endDate).format('HH:mm:ss');
- let startTimeOne = startTime.replace(/:/g,'');
- let endTimeOne = endTime.replace(/:/g,'');
- if(startTimeOne>endTimeOne){
- that.$message.warning("闈炶法澶╃彮娆＄粨鏉熸椂闂翠笉鑳藉皬浜庣瓑浜庡紑濮嬫椂闂达紒")
- that.$message.success("淇濆瓨澶辫触")
+ formData.startDate = moment(formData.startDate).format('HH:mm:ss');
+ formData.endDate = moment(formData.endDate).format('HH:mm:ss');
+ formData.sleepStartDate = moment(formData.sleepStartDate).format('HH:mm:ss');
+ formData.sleepEndDate = moment(formData.sleepEndDate).format('HH:mm:ss');
+ let startTimeOne = formData.startDate.replace(/:/g,'');
+ let endTimeOne = formData.endDate.replace(/:/g,'');
+ if(startTimeOne > endTimeOne){
+ // 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 +263,18 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("淇濆瓨鎴愬姛")
+ // that.$message.success("淇濆瓨鎴愬姛")
+ that.$notification.success({
+ 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 +293,18 @@
}
obj.then((res) => {
if (res.success) {
- that.$message.success("淇濆瓨鎴愬姛")
+ // that.$message.success
+ that.$notification.success({
+ 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