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

Merge branch 'sprint/170_tianshujie_43901' into 'sprint/170'

Browse Source 
* Merge conflicts.

See merge request easycorp/zentaopms!368
This commit is contained in:
李玉春
2021-11-09 08:28:32 +00:00
parent 8ee4448e4d 9e622a2995
commit 9705edb48e
3 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/model.php
+4 -25
View File
@@ -206,15 +206,10 @@ class productplanModel extends model
$plans = $this->reorder4Children($plans);
$planPairs = array();
$parent = 0;
$parentTitle = array();
foreach($plans as $plan)
{
if($plan->parent == '-1')
{
$parent = $plan->id;
$parentTitle[$parent] = $plan->title;
}
if($plan->parent == '-1') $parentTitle[$parent] = $plan->title;
if($plan->parent > 0 and isset($parentTitle[$plan->parent])) $plan->title = $parentTitle[$plan->parent] . ' /' . $plan->title;
$planPairs[$plan->id] = $plan->title . " [{$plan->begin} ~ {$plan->end}]";
if($plan->begin == '2030-01-01' and $plan->end == '2030-01-01') $planPairs[$plan->id] = $plan->title . ' ' . $this->lang->productplan->future;
@@ -257,15 +252,10 @@ class productplanModel extends model
$plans = $this->reorder4Children($plans);
$planPairs = array();
$parent = 0;
$parentTitle = array();
foreach($plans as $plan)
{
if($plan->parent == '-1')
{
$parent = $plan->id;
$parentTitle[$parent] = $plan->title;
}
if($plan->parent == '-1') $parentTitle[$parent] = $plan->title;
if($plan->parent > 0 and isset($parentTitle[$plan->parent])) $plan->title = $parentTitle[$plan->parent] . ' /' . $plan->title;
$planPairs[$plan->id] = $plan->title . " [{$plan->begin} ~ {$plan->end}]";
if($plan->begin == '2030-01-01' and $plan->end == '2030-01-01') $planPairs[$plan->id] = $plan->title . ' ' . $this->lang->productplan->future;
@@ -291,15 +281,10 @@ class productplanModel extends model
$plans = $this->reorder4Children($plans);
$planPairs = array();
$parent = 0;
$parentTitle = array();
foreach($plans as $plan)
{
if($plan->parent == '-1')
{
$parent = $plan->id;
$parentTitle[$parent] = $plan->title;
}
if($plan->parent == '-1') $parentTitle[$parent] = $plan->title;
if($plan->parent > 0 and isset($parentTitle[$plan->parent])) $plan->title = $parentTitle[$plan->parent] . ' /' . $plan->title;
$planPairs[$plan->id] = $plan->title;
}
@@ -323,19 +308,13 @@ class productplanModel extends model
if(!empty($plans)) $plans = $this->reorder4Children($plans);
$parent = 0;
$parentTitle = array();
$planGroup = array();
foreach($plans as $plan)
{
if(!isset($planGroup[$plan->product][$plan->branch])) $planGroup[$plan->product][$plan->branch] = array('' => '');
if($plan->parent == '-1')
{
$parent = $plan->id;
$parentTitle[$parent] = $plan->title;
}
if($plan->parent == '-1') $parentTitle[$parent] = $plan->title;
if($plan->parent > 0 and isset($parentTitle[$plan->parent])) $plan->title = $parentTitle[$plan->parent] . ' /' . $plan->title;
$planGroup[$plan->product][$plan->branch][$plan->id] = $plan->title . " [{$plan->begin} ~ {$plan->end}]";
if($plan->begin == '2030-01-01' and $plan->end == '2030-01-01') $planGroup[$plan->product][$plan->branch][$plan->id] = $plan->title . ' ' . $this->lang->productplan->future;
module/project/js/common.js
+1 -1
View File
@@ -168,7 +168,7 @@ function loadBranches(product)
if($inputgroup.find('.chosen-container').size() >= 2) $inputgroup.find('.chosen-container:last').remove();
var index = $inputgroup.find('select:first').attr('id').replace('products' , '');
$.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=0&param=noclosed"), function(data)
$.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=0&param=active"), function(data)
{
if(data)
{
module/project/js/create.js
+1 -1
View File
@@ -173,7 +173,7 @@ function loadBranches(product)
if($inputgroup.find('.chosen-container').size() >= 2) $inputgroup.find('.chosen-container:last').remove();
var index = $inputgroup.find('select:first').attr('id').replace('products' , '');
$.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=0&param=noclosed"), function(data)
$.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=0&param=active"), function(data)
{
if(data)
{