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

Merge branch 'sprint/237_liumengyi_fixbug' into 'master'

Browse Source 
* Fix bug #26298, #25695, #27192, #25409, #27020, #23401.

See merge request easycorp/zentaopms!5262
This commit is contained in:
孙广明
2022-09-06 00:42:27 +00:00
parent 81223fe4c5 6a2deee711
commit a321b87f1c
13 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/css/create.css
+2 -1
View File
@@ -11,13 +11,14 @@
#copyProjectModal a.active {border-color: #00da88; color: #00da88; background-color: #E5FFE6;}
#copyProjectModal a.active:after {position: absolute; content: '\e92f'; font-family: ZentaoIcon; font-size: 20px; right: 25px;}
#copyProjectModal a.cancel {color: #ff5d5d;}
#mainContent td.required:after {right: -4px;}
#budget {border-right: 0px;}
#budgetUnit {border-left: 0px;}
#projectName {display: inline-block; width: 32%;}
#productsBox a {border-radius: 2px !important;}
#productsBox .col-sm-4 {padding-right: 5px;}
#productsBox .addProduct {padding-left: 0px !important;}
#productsBox .required:after{right: -6px !important;}
#productsBox .required:after{right: -10px !important;}
#productsBox .input-group-addon > div {display: inline-block !important;}
#plansBox .row {display: inline-table; width: 102%;}
#plansBox .col-sm-4 {float: none; display: inline-block; padding-right: 5px;}
module/project/css/edit.css
+1
View File
@@ -6,3 +6,4 @@
#endList {vertical-align: top; padding-top: 13px;}
#dataform th {vertical-align: top; padding-top: 13px;}
#linkPlan {padding-top: 25px !important;}
#productsBox .row .col-sm-4.required::after {right: -5px;}
module/project/js/create.js
+6 -1
View File
@@ -149,6 +149,8 @@ function setParentProgram(parentProgram)
});
$('#parent').attr('data-lastSelected', parentProgram);
if(parentProgram != '0') $('#productsBox .row .input-group:first').addClass('required');
if(parentProgram == '0') $('#productsBox .row .input-group').removeClass('required');
}
/**
@@ -185,6 +187,9 @@ function addNewProduct(obj)
$('#productName').removeAttr('disabled', true);
$('#productsBox .addProduct').removeClass('hidden');
$('#productTitle').html(productName);
if($('#parent').val() != '0') $('#productsBox .addProduct .input-group:first').addClass('required');
if($('#parent').val() == '0') $('#productsBox .addProduct .input-group').removeClass('required');
}
else
{
@@ -246,7 +251,7 @@ function loadBranches(product)
if($('#productsBox .row .input-group:last select:first').val() != 0)
{
var length = $('#productsBox .row .input-group').size();
var $html = $('#productsBox .row .col-sm-4:last').html();
var $html = $('#productsBox .row .col-sm-4:last').html().replace('required', '');
$('#productsBox .row .col-sm-4:last').find('.input-group-addon').remove();
$('#productsBox .row').append('<div class="col-sm-4">' + $html + '</div>');
if($('#productsBox .row .input-group:last select').size() >= 2) $('#productsBox .row .input-group:last select:last').remove();