diff --git a/lib/zin/wg/productsbox/v1.php b/lib/zin/wg/productsbox/v1.php index ca8480f964..d6e8ef5bcf 100644 --- a/lib/zin/wg/productsbox/v1.php +++ b/lib/zin/wg/productsbox/v1.php @@ -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 ); } diff --git a/module/execution/ui/create.field.php b/module/execution/ui/create.field.php index 71ef335cc1..30f00a6571 100644 --- a/module/execution/ui/create.field.php +++ b/module/execution/ui/create.field.php @@ -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') diff --git a/module/execution/ui/edit.field.php b/module/execution/ui/edit.field.php index 6edf3778ae..fd53e23ccd 100644 --- a/module/execution/ui/edit.field.php +++ b/module/execution/ui/edit.field.php @@ -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') diff --git a/module/project/ui/common.field.php b/module/project/ui/common.field.php index 587d48e882..bab4db570a 100644 --- a/module/project/ui/common.field.php +++ b/module/project/ui/common.field.php @@ -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')