From ccdb189af44e4f38d2d37ef730330c6438a275c7 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Fri, 23 Jul 2021 16:01:13 +0800
Subject: [PATCH] * Code for task #13559.

---
 module/project/config.php           |  4 ++--
 module/project/view/browse.html.php | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/module/project/config.php b/module/project/config.php
index cea74baa0d..78c2f28e31 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -92,14 +92,14 @@ $config->project->datatable->fieldList['estimate']['pri']      = '8';
 
 $config->project->datatable->fieldList['consume']['title']    = 'consume';
 $config->project->datatable->fieldList['consume']['fixed']    = 'no';
-$config->project->datatable->fieldList['consume']['width']    = '70';
+$config->project->datatable->fieldList['consume']['width']    = '80';
 $config->project->datatable->fieldList['consume']['maxWidth'] = '80';
 $config->project->datatable->fieldList['consume']['required'] = 'no';
 $config->project->datatable->fieldList['consume']['sort']     = 'no';
 $config->project->datatable->fieldList['consume']['pri']      = '7';
 
 $config->project->datatable->fieldList['progress']['title']    = 'progress';
-$config->project->datatable->fieldList['progress']['fixed']    = 'right';
+$config->project->datatable->fieldList['progress']['fixed']    = 'no';
 $config->project->datatable->fieldList['progress']['width']    = '60';
 $config->project->datatable->fieldList['progress']['required'] = 'no';
 $config->project->datatable->fieldList['progress']['sort']     = 'no';
diff --git a/module/project/view/browse.html.php b/module/project/view/browse.html.php
index 22a6f3e066..841168cc08 100644
--- a/module/project/view/browse.html.php
+++ b/module/project/view/browse.html.php
@@ -11,6 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/datatable.fix.html.php';?>
 <?php
 js::set('orderBy', $orderBy);
 js::set('programID', $programID);
@@ -80,10 +81,15 @@ js::set('browseType', $browseType);
         <nav class="btn-toolbar pull-right"></nav>
       </div>
       <?php
-        $vars = "programID=$programID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";
+        $vars         = "programID=$programID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";
+        $datatableId  = $this->moduleName . ucfirst($this->methodName);
+        $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
+        
+        if($useDatatable) include '../../common/view/datatable.html.php';
         $setting = $this->datatable->getSetting('project');
       ?>
-      <table class='table has-sort-head'>
+      <?php if(!$useDatatable) echo '<div class="table-responsive">';?>
+      <table class='table has-sort-head <?php if($useDatatable) echo 'datatable';?>'>
       <?php $canBatchEdit = $this->config->systemMode == 'new' ? common::hasPriv('project', 'batchEdit') : common::hasPriv('project', 'batchEdit');?>
         <thead>
           <tr>
@@ -106,6 +112,7 @@ js::set('browseType', $browseType);
           <?php endforeach;?>
         </tbody>
       </table>
+      <?php if(!$useDatatable) echo '</div>';?>
       <div class='table-footer'>
         <?php if($canBatchEdit):?>
         <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>