Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #26612.

Browse Source
This commit is contained in:
zhouxudong
2022-08-19 03:07:13 +00:00
parent ce335348a8
commit b058344542
9 changed files with 32 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/js/common.js
+4 -12
View File
@@ -360,18 +360,14 @@ function compareChildDate()
if(programBegin <= childBegin && programEnd >= childEnd) return;
var dateTip = '';
if(programBegin > childBegin && programEnd >= childEnd)
if(programBegin > childBegin)
{
dateTip = "<span id='dateTip' class='text-remind'><p>" + beginGreateChild + childInfo.minChildBegin + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
}
else if(programEnd < childEnd && programBegin <= childBegin)
else if(programEnd < childEnd)
{
dateTip = "<span id='dateTip' class='text-remind'><p>" + endLetterChild + childInfo.maxChildEnd + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
}
else
{
dateTip = "<span id='dateTip' class='text-remind'><p>" + dateExceedChild + childInfo.minChildBegin + "~" + childInfo.maxChildEnd + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
}
$('#dateBox').after(dateTip);
});
@@ -419,18 +415,14 @@ function outOfDateTip()
return;
}
if(programBegin < parentBegin && programEnd <= parentEnd && programEnd >= parentBegin)
if(programBegin < parentBegin)
{
dateTip = "<span id='dateTip' class='text-remind'><p>" + beginLetterParent + data.selectedProgramBegin + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
}
else if(programEnd > parentEnd && programBegin >= parentBegin && programBegin <= parentEnd)
else if(programEnd > parentEnd)
{
dateTip = "<span id='dateTip' class='text-remind'><p>" + endGreaterParent + data.selectedProgramEnd + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
}
else
{
dateTip = "<span id='dateTip' class='text-remind'><p>" + dateExceedParent + data.selectedProgramBegin + "~" + data.selectedProgramEnd + "</p><p id='ignore' onclick='ignoreTip(this)'>" + ignore + "</p></span>";
}
$('#dateBox').after(dateTip);
});