Commit a132b342537a29192a1798ed75ac495a736fbbbc

Authored by zhangzzzz
1 parent d72f1101

sShift=1白班,sShift=2夜班;

src/mes/common/siderInfoComponent/index.js
@@ -636,7 +636,7 @@ const TeamInfoComponent = () => { @@ -636,7 +636,7 @@ const TeamInfoComponent = () => {
636 </div> 636 </div>
637 <div> 637 <div>
638 <span>班次:</span> 638 <span>班次:</span>
639 - <span>{sShift == 1 ? "早班" : sShift == 2 ? "中班" : "夜班"}</span> 639 + <span>{sShift == 1 ? "班" : "夜班"}</span>
640 </div> 640 </div>
641 </Col> 641 </Col>
642 </Row> 642 </Row>
src/mes/common/tbTimeModalComponent/index.js
@@ -75,7 +75,7 @@ const TBTimeModalComponent = props =&gt; { @@ -75,7 +75,7 @@ const TBTimeModalComponent = props =&gt; {
75 } 75 }
76 76
77 const userinfo = commonUtils.getAppData("userinfo"); 77 const userinfo = commonUtils.getAppData("userinfo");
78 - let currentShift = "班"; 78 + let currentShift = "班";
79 let startOfDay = moment() 79 let startOfDay = moment()
80 .startOf("day") 80 .startOf("day")
81 .hours(8) 81 .hours(8)
@@ -87,7 +87,7 @@ const TBTimeModalComponent = props =&gt; { @@ -87,7 +87,7 @@ const TBTimeModalComponent = props =&gt; {
87 .minutes(0) 87 .minutes(0)
88 .seconds(59); 88 .seconds(59);
89 if (userinfo.sShift === 2 || userinfo.sShift === "2") { 89 if (userinfo.sShift === 2 || userinfo.sShift === "2") {
90 - currentShift = "晚班"; 90 + currentShift = "夜斑";
91 startOfDay = moment() 91 startOfDay = moment()
92 .startOf("day") 92 .startOf("day")
93 .hours(20) 93 .hours(20)
src/mes/costomPageFun/index.js
@@ -1194,7 +1194,7 @@ const mesTableChange3 = (props, tableName) =&gt; { @@ -1194,7 +1194,7 @@ const mesTableChange3 = (props, tableName) =&gt; {
1194 const time = moment(tWorkingDate).format("YYYY-MM-DD"); 1194 const time = moment(tWorkingDate).format("YYYY-MM-DD");
1195 let startTime, endTime; 1195 let startTime, endTime;
1196 1196
1197 - if (sShift === "1" || sShift === "班") { 1197 + if (sShift === "1" || sShift === "班") {
1198 startTime = moment(`${time} 08:00:00`); 1198 startTime = moment(`${time} 08:00:00`);
1199 endTime = moment(`${time} 20:00:00`); 1199 endTime = moment(`${time} 20:00:00`);
1200 } else { 1200 } else {
@@ -1214,7 +1214,7 @@ const mesTableChange3 = (props, tableName) =&gt; { @@ -1214,7 +1214,7 @@ const mesTableChange3 = (props, tableName) =&gt; {
1214 !checkTime.isSameOrBefore(endTime) 1214 !checkTime.isSameOrBefore(endTime)
1215 ) { 1215 ) {
1216 let msg = ""; 1216 let msg = "";
1217 - if (sShift === "1" || sShift === "班") { 1217 + if (sShift === "1" || sShift === "班") {
1218 if (bDelayedOvertime) { 1218 if (bDelayedOvertime) {
1219 msg = `交接时间必须在${time}日8:00之后!`; 1219 msg = `交接时间必须在${time}日8:00之后!`;
1220 } else { 1220 } else {
src/mes/indexMes/index.js
@@ -528,7 +528,7 @@ const HeaderConponent = () =&gt; { @@ -528,7 +528,7 @@ const HeaderConponent = () =&gt; {
528 <span>班组:</span> 528 <span>班组:</span>
529 <span>{sTeamNameSName}</span> 529 <span>{sTeamNameSName}</span>
530 <span> 530 <span>
531 - ({sShift == 1 ? "早班" : sShift == 2 ? "中班" : "夜班"}) 531 + ({sShift == 1 ? "班" : "夜班"})
532 </span> 532 </span>
533 </div> 533 </div>
534 <div> 534 <div>