From 6ce948e2d3d011c6474ffbc231beb43ea4fea97a Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Thu, 7 Jan 2021 09:17:05 +0800
Subject: [PATCH 1/2] * Finish task #8941.

---
 module/product/view/project.html.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index b171833ee6..b778b7d0ba 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -41,7 +41,7 @@
           <th class='w-100px'><?php echo $lang->program->PRJBudget;?></th>
           <th class='w-80px text-center'><?php echo $lang->program->PRJEstimate;?></th>
           <th class='w-80px text-center'><?php echo $lang->program->PRJConsume;?></th>
-          <th class='w-150px text-center'><?php echo $lang->program->PRJProgress;?></th>
+          <th class='w-60px'><?php echo $lang->program->PRJProgress;?></th>
         </tr>
       </thead>
       <tbody>
@@ -61,11 +61,9 @@
           <td><?php echo $project->budget != 0 ? $project->budget . zget($this->lang->program->unitList, $project->budgetUnit) : $this->lang->program->future;?></td>
           <td class="text-center"><?php echo $project->hours->totalEstimate;?></td>
           <td class="text-center"><?php echo $project->hours->totalConsumed;?></td>
-          <td class="c-progress">
-            <div class="progress progress-text-left">
-              <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $project->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->hours->progress;?>%">
-              <span class="progress-text"><?php echo $project->hours->progress;?>%</span>
-              </div>
+          <td>
+            <div class='progress-pie' data-doughnut-size='80' data-color='#00da88' data-value='<?php echo $project->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
+              <div class='progress-info'><?php echo $project->hours->progress;?>%</div>
             </div>
           </td>
         </tr>

From 782f3f1c0774f69cd384b5c1e92a7e4162792445 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Thu, 7 Jan 2021 09:18:26 +0800
Subject: [PATCH 2/2] * Finish task #8947.

---
 module/program/js/prjcreate.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/program/js/prjcreate.js b/module/program/js/prjcreate.js
index daf5134c10..b06006cf65 100644
--- a/module/program/js/prjcreate.js
+++ b/module/program/js/prjcreate.js
@@ -231,7 +231,8 @@ $('#projectName').on('keyup', function()
         $('#copyProjects').html(data);
         $('#copyProjects a').click(function()
         {
-            setCopyProject($(this).data('id')); $('#copyProjectModal').modal('hide')
+            setCopyProject($(this).data('id'));
+            $('#copyProjectModal').modal('hide');
         });
     })
 })