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

*[misc] modify productsummary pivot.

Browse Source
This commit is contained in:
songchenxuan
2024-09-11 15:50:20 +08:00
committed by 周鑫
parent 183f743ff2
commit 6d8e5ce684
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/pivot/tao.php
-1
View File
@@ -22,7 +22,6 @@ class pivotTao extends pivotModel
->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id')
->where('t1.deleted')->eq('0')
->andWhere('t1.shadow')->eq('0')
->beginIF(strpos($conditions, 'closedProduct') === false)->andWhere('t1.status')->ne('closed')->fi()
->beginIF(!empty($IDList))->andWhere('t1.id')->in($IDList)->fi()
->beginIF($productID)->andWhere('t1.id')->eq($productID)->fi()
->beginIF($productStatus)->andWhere('t1.status')->eq($productStatus)->fi()
module/pivot/ui/productsummary.html.php
+1 -1
View File
@@ -30,7 +30,7 @@ $generateData = function() use ($lang, $title, $cols, $data, $products, $filters
(
on::change('loadProductSummary'),
set::inline(true),
set::items(array(array('text' => $lang->pivot->closedProduct, 'value' => 'closedProduct'), array('text' => $lang->pivot->overduePlan, 'value' => 'overduePlan')))
set::items(array(array('text' => $lang->pivot->overduePlan, 'value' => 'overduePlan')))
),
div
(
module/pivot/zen.php
+1 -1
View File
@@ -240,7 +240,7 @@ class pivotZen extends pivot
* @access public
* @return void
*/
public function productSummary(string $conditions = '', int $productID = 0, string $productStatus = 'normal', string $productType = 'normal'): void
public function productSummary(string $conditions = '', int|string $productID = 0, string $productStatus = 'normal', string $productType = 'normal'): void
{
$this->app->loadLang('story');
$this->app->loadLang('product');