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

* Code for bug #45132.

Browse Source
This commit is contained in:
sunguangming
2024-01-29 15:31:35 +08:00
parent bef1fb8844
commit cd59afa033
4 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zin/wg/productsbox/v1.php
+3 -3
View File
@@ -23,6 +23,7 @@ class productsBox extends wg
'project?: object', // 关联的项目。
'isStage?: bool', // 是否是阶段类型。
'hasNewProduct?: bool=false', // 是否有新产品。
'errorSameProducts?: string', // 选择同一个产品的提示。
);
public static function getPageCSS(): string|false
@@ -37,8 +38,7 @@ class productsBox extends wg
protected function build(): wg
{
global $lang;
list($project, $productItems, $linkedProducts) = $this->prop(array('project', 'productItems', 'linkedProducts'));
list($project, $productItems, $linkedProducts, $errorSameProducts) = $this->prop(array('project', 'productItems', 'linkedProducts', 'errorSameProducts'));
$productsBox = array();
if((!empty($project->hasProduct) || is_null($project)) && $linkedProducts)
@@ -62,7 +62,7 @@ class productsBox extends wg
on::change('.productsBox [name^=products]', 'loadBranches'),
jsVar('multiBranchProducts', data('multiBranchProducts')),
jsVar('project', \zget($project, 'id', 0)),
jsVar('errorSameProducts', $lang->project->errorSameProducts),
jsVar('errorSameProducts', $errorSameProducts),
$productsBox
);
}
module/execution/ui/create.field.php
+12 -11
View File
@@ -74,17 +74,18 @@ $fields->field('productsBox')
->width('full')
->control(array
(
'control' => 'productsBox',
'productItems' => data('allProducts'),
'branchGroups' => data('branchGroups'),
'planGroups' => data('productPlans'),
'linkedProducts' => data('products'),
'linkedBranches' => data('linkedBranches'),
'currentProduct' => data('productID'),
'currentPlan' => data('planID'),
'productPlans' => data('productPlan'),
'project' => data('project'),
'isStage' => data('isStage'),
'control' => 'productsBox',
'productItems' => data('allProducts'),
'branchGroups' => data('branchGroups'),
'planGroups' => data('productPlans'),
'linkedProducts' => data('products'),
'linkedBranches' => data('linkedBranches'),
'currentProduct' => data('productID'),
'currentPlan' => data('planID'),
'productPlans' => data('productPlan'),
'project' => data('project'),
'isStage' => data('isStage'),
'errorSameProducts' => $lang->execution->errorSameProducts,
));
$fields->field('desc')
module/execution/ui/edit.field.php
+10 -9
View File
@@ -133,15 +133,16 @@ if($hasPercent)
$fields->field('productsBox')
->width('full')
->control(array(
'control' => 'productsBox',
'productItems' => data('allProducts'),
'branchGroups' => data('branchGroups'),
'planGroups' => data('productPlans'),
'linkedProducts' => data('linkedProducts'),
'linkedBranches' => data('linkedBranches'),
'productPlans' => data('productPlans'),
'project' => data('project'),
'isStage' => isset($project->model) && in_array($project->model, array('waterfall', 'waterfallplus'))
'control' => 'productsBox',
'productItems' => data('allProducts'),
'branchGroups' => data('branchGroups'),
'planGroups' => data('productPlans'),
'linkedProducts' => data('linkedProducts'),
'linkedBranches' => data('linkedBranches'),
'productPlans' => data('productPlans'),
'project' => data('project'),
'isStage' => isset($project->model) && in_array($project->model, array('waterfall', 'waterfallplus')),
'errorSameProducts' => $lang->execution->errorSameProducts,
));
$fields->field('PO')
module/project/ui/common.field.php
+11 -10
View File
@@ -65,16 +65,17 @@ $fields->field('productsBox')
->width('full')
->control(array
(
'control' => 'productsBox',
'productItems' => data('allProducts'),
'branchGroups' => data('branchGroups'),
'planGroups' => data('productPlans'),
'productPlans' => data('productPlans'),
'linkedProducts' => data('linkedProducts'),
'linkedBranches' => data('linkedBranches'),
'project' => data('project') ? data('project') : data('copyProject'),
'hasNewProduct' => data('app.rawMethod') == 'create',
'isStage' => data('isStage')
'control' => 'productsBox',
'productItems' => data('allProducts'),
'branchGroups' => data('branchGroups'),
'planGroups' => data('productPlans'),
'productPlans' => data('productPlans'),
'linkedProducts' => data('linkedProducts'),
'linkedBranches' => data('linkedBranches'),
'project' => data('project') ? data('project') : data('copyProject'),
'hasNewProduct' => data('app.rawMethod') == 'create',
'isStage' => data('isStage'),
'errorSameProducts' => $lang->project->errorSameProducts,
));
if($model == 'waterfall' || $model == 'waterfallplus')