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

* Finish task #43541.

Browse Source
This commit is contained in:
tanghucheng
2021-10-27 16:30:56 +08:00
parent a0d22615b8
commit 4ea309a73d
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/css/view.css
-3
View File
@@ -5,9 +5,6 @@
td.normal {color: #00da88;}
td.acl {white-space: nowrap;}
.row > .col-sm-12:first-child {padding-bottom: 20px;}
<<<<<<< HEAD
.c-product ,.c-release ,.c-code {width: 100px !important;}
.c-openedBy ,.c-acl ,.c-pss,.c-common {width:110px !important;}
.c-bugs ,.c-type {width:120px !important;}
=======
>>>>>>> d2cca97b50aeb7612aafe6386613f0f4e697c4c8
module/product/view/view.html.php
+8 -16
View File
@@ -43,9 +43,9 @@
<table class="table table-data">
<tbody>
<tr>
<th class="w-100px"><i class="icon icon-person icon-sm"></i> <?php echo $lang->productCommon;?></th>
<th class="c-product"><i class="icon icon-person icon-sm"></i> <?php echo $lang->productCommon;?></th>
<td><strong><?php echo zget($users, $product->PO);?></strong></td>
<th class="w-100px"><i class="icon icon-person icon-sm"></i> <?php echo $lang->product->release;?></th>
<th class="c-release"><i class="icon icon-person icon-sm"></i> <?php echo $lang->product->release;?></th>
<td><strong><?php echo zget($users, $product->RD);?></strong></td>
<td></td>
</tr>
@@ -64,17 +64,13 @@
<tbody>
<tr>
<?php if(!empty($product->code)):?>
<th class="w-100px"><?php echo $lang->product->code;?></th>
<th class="c-code"><?php echo $lang->product->code;?></th>
<td><strong><?php echo $product->code;?></strong></td>
<?php else:?>
<<<<<<< HEAD
<th class="c-type"><?php echo $lang->product->type;?></th>
=======
<th class="w-110px"><?php echo $lang->product->type;?></th>
>>>>>>> d2cca97b50aeb7612aafe6386613f0f4e697c4c8
<td><strong><?php echo zget($lang->product->typeList, $product->type);?></strong></td>
<?php endif;?>
<th class="w-110px"><?php echo $lang->story->openedBy?></th>
<th class="c-openedBy"><?php echo $lang->story->openedBy?></th>
<td colspan="2"><strong><?php echo zget($users, $product->createdBy);?></strong></td>
</tr>
<tr>
@@ -82,14 +78,10 @@
<th class="c-type"><?php echo $lang->product->type;?></th>
<td><strong><?php echo zget($lang->product->typeList, $product->type);?></strong></td>
<?php else:?>
<<<<<<< HEAD
<th class="c-pss"><?php echo $lang->productCommon ." ". $lang->product->status;?></th>
=======
<th class="w-110px"><?php echo $lang->productCommon ." ". $lang->product->status;?></th>
>>>>>>> d2cca97b50aeb7612aafe6386613f0f4e697c4c8
<td class="<?php echo $product->status;?>"><strong><?php echo zget($lang->product->statusList, $product->status);?></strong></td>
<?php endif;?>
<th class="w-110px"><?php echo $lang->story->openedDate?></th>
<th><?php echo $lang->story->openedDate?></th>
<td colspan="2"><strong><?php echo formatTime($product->createdDate, DT_DATE1);?></strong></td>
</tr>
<tr>
@@ -97,7 +89,7 @@
<th class="c-pss"><?php echo $lang->productCommon ." ". $lang->product->status;?></th>
<td class="<?php echo $product->status;?>"><strong><?php echo zget($lang->product->statusList, $product->status);?></strong></td>
<?php endif;?>
<th class="w-110px"><?php echo $lang->product->acl;?></th>
<th class="c-acl"><?php echo $lang->product->acl;?></th>
<td <?php echo empty($product->code) ? "colspan='4'" : "colspan='2'";?>><strong><?php echo $lang->product->aclList[$product->acl];?></strong></td>
</tr>
<?php if($product->acl == 'custom'):?>
@@ -124,11 +116,11 @@
<tbody>
<?php $space = common::checkNotCN() ? ' ' : '';?>
<tr>
<th class="w-110px"><?php echo $lang->story->statusList['active'] . $space . $lang->story->common;?></th>
<th class="c-common"><?php echo $lang->story->statusList['active'] . $space . $lang->story->common;?></th>
<td><strong><?php echo $product->stories['active']?></strong></td>
<th><?php echo $lang->product->plans?></th>
<td><strong><?php echo $product->plans?></strong></td>
<th class='w-120px'><?php echo $lang->product->bugs?></th>
<th class='c-bugs'><?php echo $lang->product->bugs?></th>
<td><strong><?php echo $product->bugs?></strong></td>
</tr>
<tr>