Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'

* Fix execution and project linked product prompt issues.

See merge request easycorp/zentaopms!536
This commit is contained in:
李玉春
2021-11-19 00:47:09 +00:00
3 changed files with 3 additions and 5 deletions
+1 -3
View File
@@ -124,7 +124,7 @@ function computeEndDate(delta)
*/
function loadBranches(product)
{
$('#productsBox select').each(function()
$("#productsBox select[name^='products']").each(function()
{
var $product = $(product);
if($product.val() != 0 && $product.val() == $(this).val() && $product.attr('id') != $(this).attr('id') && !multiBranchProducts[$product.val()])
@@ -216,8 +216,6 @@ function adjustPlanBoxMargin()
}
}
function loadBranch(){}
/* Auto compute the work days. */
$(function()
{
+1 -1
View File
@@ -139,7 +139,7 @@ function loadBranches(product)
/* When selecting a product, delete a plan that is empty by default. */
$("#planDefault").remove();
$('#productsBox select').each(function()
$("#productsBox select[name^='products']").each(function()
{
var $product = $(product);
if($product.val() != 0 && $product.val() == $(this).val() && $product.attr('id') != $(this).attr('id') && !multiBranchProducts[$product.val()])
+1 -1
View File
@@ -138,7 +138,7 @@ function setAclList(programID)
*/
function loadBranches(product)
{
$('#productsBox select').each(function()
$("#productsBox select[name^='products']").each(function()
{
var $product = $(product);
if($product.val() != 0 && $product.val() == $(this).val() && $product.attr('id') != $(this).attr('id') && !multiBranchProducts[$product.val()])