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

Merge branch 'sprint/pailei2_tianshujie_fixbug' into 'pailei2'

Browse Source 
Sprint/pailei2 tianshujie fixbug

See merge request easycorp/zentaopms!2376
This commit is contained in:
李玉春
2022-03-18 09:03:37 +00:00
parent fedc6ab93a fb3f55efd5
commit 09ac8ec0f8
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/css/splitcolumn.css
+1
View File
@@ -2,6 +2,7 @@
.c-WIPTitle {width: 80px; padding-left: 15px !important; padding-right: 0px !important;}
.c-color {width: 320px;}
.c-WIPCount {width: 240px;}
.c-WIPTitle {width: 85px;}
td.required:after {right: -1px;}
.c-action {width: 80px;}
.c-action > a {padding-top: 10px;}
module/kanban/js/view.js
+1 -1
View File
@@ -1504,7 +1504,7 @@ function initSortable()
var groupID = e.element.closest('.kanban-board').data('id');
e.list.each(function(index, data)
{
if(data.item.hasClass('kanban-col') && data.item.hasClass('sort') && groupID == data.item.data().col.group) orders.push(data.item.data('id'));
if(data.item.hasClass('kanban-col') && (data.item.hasClass('sort') || data.item.children().hasClass('sort')) && groupID == data.item.data().col.group) orders.push(data.item.data('id'));
});
regionID = e.element.closest('.region').data('id');
module/my/control.php
+2 -2
View File
@@ -170,7 +170,7 @@ class my extends control
$riskCount = $pager->recTotal;
/* Get the number of reviews assigned to me. */
$reviewList = $this->review->getUserReviews('wait', 'id_desc', $pager);
$reviewList = $this->review->getUserReviews('needreview', 'id_desc', $pager);
$reviewCount = $pager->recTotal;
/* Get the number of nc assigned to me. */
@@ -803,7 +803,7 @@ EOF;
* @access public
* @return void
*/
public function audit($browseType = 'wait', $orderBy = 't1.id_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
public function audit($browseType = 'needreview', $orderBy = 't1.id_desc', $recTotal = 0, $recPerPage = 15, $pageID = 1)
{
$this->loadModel('datatable');
$this->loadModel('baseline');