licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日期判断问题

Browse Source
This commit is contained in:
Ledo 2025-07-08 18:43:40 +08:00
parent a92d717c5f
commit 5658bfde75
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/2d.vue
View File

@ -190,19 +190,21 @@ const getDetailMsg = (row) =>{
if(row.twoDimDate != null && row.lastDate != null ){
const starttemp = new Date(row.twoDimDate);
starttemp.setHours(23,59,59,999);
const endtemp = new Date(row.lastDate);
endtemp.setHours(23,59,59,999);
const start =starttemp.getTime()
const end = new Date(row.lastDate).getTime();
const end = endtemp.getTime();
const diffTime = Math.abs(end - start);
var day = Math.floor(diffTime / (1000 * 60 * 60 * 24));
if(day == 0){
if(row.isDelay == 1 && row.lastDate > row.blankDate){
if(row.isDelay == 1 && row.lastDate > starttemp){
return '延后' + (day+1) +'天';
}
return '按时完成'
}else{
if(row.lastDate > row.blankDate){
if(row.lastDate > starttemp){
return '延后' + day +'天';
}else if (row.lastDate < row.blankDate){
}else if (row.lastDate < starttemp){
return '提前' + day +'天';
}else{
return '按时完成'

10
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/3d.vue
View File

@ -240,19 +240,21 @@ const getDetailMsg = (row) =>{
if(row.threeDimDate != null && row.lastDate != null ){
const starttemp = new Date(row.threeDimDate);
starttemp.setHours(23,59,59,999);
const endtemp = new Date(row.lastDate);
endtemp.setHours(23,59,59,999);
const start =starttemp.getTime()
const end = new Date(row.lastDate).getTime();
const end = endtemp.getTime();
const diffTime = Math.abs(end - start);
var day = Math.floor(diffTime / (1000 * 60 * 60 * 24));
if(day == 0){
if(row.isDelay == 1 && row.lastDate > row.blankDate){
if(row.isDelay == 1 && row.lastDate > starttemp){
return '延后' + (day+1) +'天';
}
return '按时完成'
}else{
if(row.lastDate > row.blankDate){
if(row.lastDate > starttemp){
return '延后' + day +'天';
}else if (row.lastDate < row.blankDate){
}else if (row.lastDate < starttemp){
return '提前' + day +'天';
}else{
return '按时完成'

10
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/index.vue
View File

@ -208,19 +208,21 @@ const getDetailMsg = (row) =>{
if(row.craftEndDate != null && row.lastDate != null ){
const starttemp = new Date(row.craftEndDate);
starttemp.setHours(23,59,59,999);
const endtemp = new Date(row.lastDate);
endtemp.setHours(23,59,59,999);
const start =starttemp.getTime()
const end = new Date(row.lastDate).getTime();
const end = endtemp.getTime();
const diffTime = end - start
var day = Math.floor(diffTime / (1000 * 60 * 60 * 24));
if(day == 0){
if(row.isDelay == 1 && row.lastDate > row.blankDate){
if(row.isDelay == 1 && row.lastDate > starttemp){
return '延后' + (day+1) +'天';
}
return '按时完成'
}else{
if(row.lastDate > row.blankDate){
if(row.lastDate > starttemp){
return '延后' + day +'天';
}else if (row.lastDate < row.blankDate){
}else if (row.lastDate < starttemp){
return '提前' + day +'天';
}else{
return '按时完成'

4
mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/workblank.vue
View File

@ -189,8 +189,10 @@ const getDetailMsg = (row) =>{
if(row.blankDate != null && row.lastDate != null ){
const starttemp = new Date(row.blankDate);
starttemp.setHours(23,59,59,999);
const endtemp = new Date(row.lastDate);
endtemp.setHours(23,59,59,999);
const start =starttemp.getTime()
const end = new Date(row.lastDate).getTime();
const end = endtemp.getTime();
const diffTime = Math.abs(end - start);
var day = Math.floor(diffTime / (1000 * 60 * 60 * 24));
if(day == 0){