From d63c782054456b1c34e2a8298fa3703fd4c9d00f Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期二, 19 九月 2023 11:45:45 +0800
Subject: [PATCH] 班制班次页面时间问题和部分提示问题
---
src/views/mdc/base/modules/shift/ShiftInfoModel.vue | 16 +++++++++-------
src/views/mdc/base/modules/shift/ShiftSystemModel.vue | 2 +-
src/views/mdc/base/modules/shift/ShiftSystem.vue | 4 ++--
src/views/mdc/base/modules/shift/ShiftInfo.vue | 4 ++--
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/views/mdc/base/modules/shift/ShiftInfo.vue b/src/views/mdc/base/modules/shift/ShiftInfo.vue
index 7d80453..19a856d 100644
--- a/src/views/mdc/base/modules/shift/ShiftInfo.vue
+++ b/src/views/mdc/base/modules/shift/ShiftInfo.vue
@@ -154,7 +154,7 @@
deleteAction(that.url.deleteBatch, {id: record}).then((res) => {
if (res.success) {
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
@@ -173,7 +173,7 @@
putAction(this.url.changeStatus, { id: id, status: status }).then((res) => {
if (res.success) {
// _this.$message.success('鎿嶄綔鎴愬姛锛�')
- _this.$notification.warning({
+ _this.$notification.success({
message:'娑堟伅',
description:"鎿嶄綔鎴愬姛"
});
diff --git a/src/views/mdc/base/modules/shift/ShiftInfoModel.vue b/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
index ed99075..1ed89ef 100644
--- a/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
+++ b/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
@@ -232,11 +232,13 @@
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){
+ 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:'娑堟伅',
@@ -262,7 +264,7 @@
obj.then((res) => {
if (res.success) {
// that.$message.success("淇濆瓨鎴愬姛")
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:"淇濆瓨鎴愬姛"
});
@@ -292,7 +294,7 @@
obj.then((res) => {
if (res.success) {
// that.$message.success
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:"淇濆瓨鎴愬姛"
});
diff --git a/src/views/mdc/base/modules/shift/ShiftSystem.vue b/src/views/mdc/base/modules/shift/ShiftSystem.vue
index c813c22..864b89b 100644
--- a/src/views/mdc/base/modules/shift/ShiftSystem.vue
+++ b/src/views/mdc/base/modules/shift/ShiftSystem.vue
@@ -133,7 +133,7 @@
postAction(this.url.changeDefaultShift,qs.stringify({id:record.id})).then((res) =>{
if(res.success){
// this.$message.success(res.message);
- this.$notification.warning({
+ this.$notification.success({
message:'娑堟伅',
description:res.message
});
@@ -156,7 +156,7 @@
deleteAction(that.url.deleteBatch, {id: record}).then((res) => {
if (res.success) {
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
diff --git a/src/views/mdc/base/modules/shift/ShiftSystemModel.vue b/src/views/mdc/base/modules/shift/ShiftSystemModel.vue
index 83bce49..4a51038 100644
--- a/src/views/mdc/base/modules/shift/ShiftSystemModel.vue
+++ b/src/views/mdc/base/modules/shift/ShiftSystemModel.vue
@@ -122,7 +122,7 @@
obj.then((res) => {
if (res.success) {
// that.$message.success(res.message)
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
--
Gitblit v1.9.3