From a132b342537a29192a1798ed75ac495a736fbbbc Mon Sep 17 00:00:00 2001
From: zhangzhen <525765282@qq.com>
Date: Tue, 2 Dec 2025 16:29:42 +0800
Subject: [PATCH] sShift=1白班,sShift=2夜班;
---
src/mes/common/siderInfoComponent/index.js | 2 +-
src/mes/common/tbTimeModalComponent/index.js | 4 ++--
src/mes/costomPageFun/index.js | 4 ++--
src/mes/indexMes/index.js | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/mes/common/siderInfoComponent/index.js b/src/mes/common/siderInfoComponent/index.js
index 0a6567e..69edcda 100644
--- a/src/mes/common/siderInfoComponent/index.js
+++ b/src/mes/common/siderInfoComponent/index.js
@@ -636,7 +636,7 @@ const TeamInfoComponent = () => {
班次:
- {sShift == 1 ? "早班" : sShift == 2 ? "中班" : "夜班"}
+ {sShift == 1 ? "白班" : "夜班"}
diff --git a/src/mes/common/tbTimeModalComponent/index.js b/src/mes/common/tbTimeModalComponent/index.js
index df6c16d..4fb2f04 100644
--- a/src/mes/common/tbTimeModalComponent/index.js
+++ b/src/mes/common/tbTimeModalComponent/index.js
@@ -75,7 +75,7 @@ const TBTimeModalComponent = props => {
}
const userinfo = commonUtils.getAppData("userinfo");
- let currentShift = "早班";
+ let currentShift = "白班";
let startOfDay = moment()
.startOf("day")
.hours(8)
@@ -87,7 +87,7 @@ const TBTimeModalComponent = props => {
.minutes(0)
.seconds(59);
if (userinfo.sShift === 2 || userinfo.sShift === "2") {
- currentShift = "晚班";
+ currentShift = "夜斑";
startOfDay = moment()
.startOf("day")
.hours(20)
diff --git a/src/mes/costomPageFun/index.js b/src/mes/costomPageFun/index.js
index f712ee2..28a3ca4 100644
--- a/src/mes/costomPageFun/index.js
+++ b/src/mes/costomPageFun/index.js
@@ -1194,7 +1194,7 @@ const mesTableChange3 = (props, tableName) => {
const time = moment(tWorkingDate).format("YYYY-MM-DD");
let startTime, endTime;
- if (sShift === "1" || sShift === "早班") {
+ if (sShift === "1" || sShift === "白班") {
startTime = moment(`${time} 08:00:00`);
endTime = moment(`${time} 20:00:00`);
} else {
@@ -1214,7 +1214,7 @@ const mesTableChange3 = (props, tableName) => {
!checkTime.isSameOrBefore(endTime)
) {
let msg = "";
- if (sShift === "1" || sShift === "早班") {
+ if (sShift === "1" || sShift === "白班") {
if (bDelayedOvertime) {
msg = `交接时间必须在${time}日8:00之后!`;
} else {
diff --git a/src/mes/indexMes/index.js b/src/mes/indexMes/index.js
index 73f738b..f496e81 100644
--- a/src/mes/indexMes/index.js
+++ b/src/mes/indexMes/index.js
@@ -528,7 +528,7 @@ const HeaderConponent = () => {
班组:
{sTeamNameSName}
- ({sShift == 1 ? "早班" : sShift == 2 ? "中班" : "夜班"})
+ ({sShift == 1 ? "白班" : "夜班"})
--
libgit2 0.22.2