Commit a132b342537a29192a1798ed75ac495a736fbbbc
1 parent
d72f1101
sShift=1白班,sShift=2夜班;
Showing
4 changed files
with
6 additions
and
6 deletions
src/mes/common/siderInfoComponent/index.js
src/mes/common/tbTimeModalComponent/index.js
| ... | ... | @@ -75,7 +75,7 @@ const TBTimeModalComponent = props => { |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | const userinfo = commonUtils.getAppData("userinfo"); |
| 78 | - let currentShift = "早班"; | |
| 78 | + let currentShift = "白班"; | |
| 79 | 79 | let startOfDay = moment() |
| 80 | 80 | .startOf("day") |
| 81 | 81 | .hours(8) |
| ... | ... | @@ -87,7 +87,7 @@ const TBTimeModalComponent = props => { |
| 87 | 87 | .minutes(0) |
| 88 | 88 | .seconds(59); |
| 89 | 89 | if (userinfo.sShift === 2 || userinfo.sShift === "2") { |
| 90 | - currentShift = "晚班"; | |
| 90 | + currentShift = "夜斑"; | |
| 91 | 91 | startOfDay = moment() |
| 92 | 92 | .startOf("day") |
| 93 | 93 | .hours(20) | ... | ... |
src/mes/costomPageFun/index.js
| ... | ... | @@ -1194,7 +1194,7 @@ const mesTableChange3 = (props, tableName) => { |
| 1194 | 1194 | const time = moment(tWorkingDate).format("YYYY-MM-DD"); |
| 1195 | 1195 | let startTime, endTime; |
| 1196 | 1196 | |
| 1197 | - if (sShift === "1" || sShift === "早班") { | |
| 1197 | + if (sShift === "1" || sShift === "白班") { | |
| 1198 | 1198 | startTime = moment(`${time} 08:00:00`); |
| 1199 | 1199 | endTime = moment(`${time} 20:00:00`); |
| 1200 | 1200 | } else { |
| ... | ... | @@ -1214,7 +1214,7 @@ const mesTableChange3 = (props, tableName) => { |
| 1214 | 1214 | !checkTime.isSameOrBefore(endTime) |
| 1215 | 1215 | ) { |
| 1216 | 1216 | let msg = ""; |
| 1217 | - if (sShift === "1" || sShift === "早班") { | |
| 1217 | + if (sShift === "1" || sShift === "白班") { | |
| 1218 | 1218 | if (bDelayedOvertime) { |
| 1219 | 1219 | msg = `交接时间必须在${time}日8:00之后!`; |
| 1220 | 1220 | } else { | ... | ... |
src/mes/indexMes/index.js