From 3435a2123c899f2a3d2887082e4f774bee661d89 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Sat, 20 Feb 2021 10:40:41 +0800
Subject: [PATCH] * Finish task#36050.

---
 module/program/config.php     |  2 +-
 module/program/css/common.css |  1 +
 module/program/model.php      | 13 +++++++------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/module/program/config.php b/module/program/config.php
index 40c93befa2..eef3c25009 100644
--- a/module/program/config.php
+++ b/module/program/config.php
@@ -88,7 +88,7 @@ $config->program->datatable->fieldList['PRJBudget']['required'] = 'yes';
 
 $config->program->datatable->fieldList['teamCount']['title']    = 'teamCount';
 $config->program->datatable->fieldList['teamCount']['fixed']    = 'no';
-$config->program->datatable->fieldList['teamCount']['width']    = '60';
+$config->program->datatable->fieldList['teamCount']['width']    = '40';
 $config->program->datatable->fieldList['teamCount']['required'] = 'no';
 $config->program->datatable->fieldList['teamCount']['sort']     = 'no';
 
diff --git a/module/program/css/common.css b/module/program/css/common.css
index f80f2d2448..613a945348 100644
--- a/module/program/css/common.css
+++ b/module/program/css/common.css
@@ -1 +1,2 @@
 .future {display: inline-block}
+.c-number {overflow:hidden;text-align:right!important;text-overflow:ellipsis;white-space:nowrap}
diff --git a/module/program/model.php b/module/program/model.php
index 61afb13609..66fd3ce5de 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -1722,11 +1722,10 @@ class programModel extends model
 
         if($col->show)
         {
-            $class = "c-$id";
             $title = '';
+            $class = "c-$id" . (in_array($id, ['PRJBudget', 'teamCount']) ? ' c-number' : ' c-name');
 
             if($id == 'idAB') $class .= ' cell-id';
-
             if($id == 'PRJName')
             {
                 $class .= ' text-left';
@@ -1748,15 +1747,17 @@ class programModel extends model
             }
             if($id == 'PRJBudget')
             {
-                $budget = $project->budget != 0 ? zget($this->lang->program->currencySymbol, $project->budgetUnit) . number_format($project->budget, 2) : $this->lang->program->future;
-                $title  = "title='$budget'";
+                $programBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) && $project->budget >= 10000 ? number_format($project->budget / 10000, 1) . $this->lang->program->tenThousand : number_format($project->budget, 1);
+                $budgetTitle   = $project->budget != 0 ? zget($this->lang->program->currencySymbol, $project->budgetUnit) . ' ' . $programBudget : $this->lang->program->future;
+
+                $title = "title='$budgetTitle'";
             }
 
             if($id == 'PRJEstimate') $title = "title='{$project->hours->totalEstimate} {$this->lang->project->workHour}'";
             if($id == 'PRJConsume')  $title = "title='{$project->hours->totalConsumed} {$this->lang->project->workHour}'";
             if($id == 'PRJSurplus')  $title = "title='{$project->hours->totalLeft} {$this->lang->project->workHour}'";
 
-            echo "<td class='c-name " . $class . "' $title>";
+            echo "<td class='$class' $title>";
             switch($id)
             {
                 case 'idAB':
@@ -1787,7 +1788,7 @@ class programModel extends model
                     echo "<span class='status-task status-{$project->status}'> " . zget($this->lang->program->statusList, $project->status) . "</span>";
                     break;
                 case 'PRJBudget':
-                    echo $budget;
+                    echo $budgetTitle;
                     break;
                 case 'teamCount':
                     echo $project->teamCount;