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

* code for task #71616.

Browse Source
This commit is contained in:
wangyidong
2022-10-10 11:31:03 +08:00
parent 87bc77221f
commit 8fdde5fa0e
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/company/control.php
+1 -1
View File
@@ -222,7 +222,7 @@ class company extends control
$this->view->projects = array($this->lang->company->project) + $projects;;
/* Get executions' list.*/
$executions = $this->loadModel('execution')->getPairs(0, 'all', 'nocode');
$executions = $this->loadModel('execution')->getPairs(0, 'all', 'nocode|multiple');
$executionsIDList = array_keys($executions);
$executionsList = $this->execution->getByIdList($executionsIDList);
foreach($executionsList as $executionsID => $executionObj)
module/company/css/dynamic.css
+2 -1
View File
@@ -20,7 +20,8 @@
.c-project, .c-product, .c-execution {width: 110px !important; overflow: unset;}
.c-user, .c-order {width: 96px !important; overflow: unset;}
.c-date {width: 200px;}
#mainMenu .picker .picker-selections{white-space:nowrap;}
.picker-drop-menu{width:auto !important; max-width:350px !important;}
.timeline>li:before {left: -26px;}
.timeline>li+li:after {left: -23px;}
module/company/js/dynamic.js
+1 -1
View File
@@ -2,7 +2,7 @@ $('#account, #product, #project, #execution, #orderBy').change(function()
{
var userID = $('#account').val();
var productID = $('#product').length ? $('#product').val() : 0;
var projectID = systemMode == 'new' ? $('#project').val() : 0;
var projectID = $('#project').val();
var executionID = $('#execution').val();
var orderBy = $('#orderBy').val();
module/company/view/dynamic.html.php
-2
View File
@@ -32,9 +32,7 @@
<?php if($this->config->vision == 'rnd'):?>
<div class="input-control space c-product"><?php echo html::select('product', $products, $productID, 'class="form-control chosen" data-max_drop_width="215"');?></div>
<?php endif;?>
<?php if($config->systemMode == 'new'):?>
<div class="input-control space c-project"><?php echo html::select('project', $projects, $projectID, 'class="form-control chosen" data-max_drop_width="215"');?></div>
<?php endif;?>
<div class="input-control space c-execution"><?php echo html::select('execution', $executions, $executionID, 'class="form-control chosen" data-max_drop_width="350"'); ?></div>
<div class="input-control space c-order"><?php echo html::select('orderBy', $lang->company->order, $orderBy, 'class="form-control chosen" data-max_drop_width="215" data-disable_search="true"'); ?></div>
<a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->action->dynamic->search;?></a>