diff --git a/app/home/controller/Index.php b/app/home/controller/Index.php
index 6dd5694..aa04d39 100644
--- a/app/home/controller/Index.php
+++ b/app/home/controller/Index.php
@@ -105,11 +105,16 @@ class Index extends BaseController
$total = [];
$adminCount = Db::name('Admin')->where('status', '1')->count();
$approveCount = Db::name('Approve')->count();
+ $noteCount = Db::name('Note')->where('status', '1')->count();
$expenseCount = Db::name('Expense')->where('delete_time', '0')->count();
$invoiceCount = Db::name('Invoice')->where('delete_time', '0')->count();
$total[] = array(
'name' => '员工',
'num' => $adminCount,
+ );
+ $total[] = array(
+ 'name' => '公告',
+ 'num' => $noteCount,
);
$total[] = array(
'name' => '审批',
diff --git a/app/project/view/task/index.html b/app/project/view/task/index.html
index 92b18b5..4801a9e 100644
--- a/app/project/view/task/index.html
+++ b/app/project/view/task/index.html
@@ -97,11 +97,7 @@
}
}
, { field: 'cate_name', title: '工作类型', width: 90, align: 'center' }
- , { field: 'type_name', title: '任务类型', width: 90, align: 'center',templet:function(d){
- var html = ''+d.type_name+'';
- return html;
- }}
- , {
+ ,{
field: 'title', title: '任务主题', rowspan: 2, templet: function (d) {
var html = '' + d.priority_name + ' ' + d.title + '';
return html;