From d6796c8986313414c5b57662fbc3b764d4338586 Mon Sep 17 00:00:00 2001
From: 郭静帆 <gjfan@bronet.cn>
Date: Wed, 26 May 2021 15:21:58 +0800
Subject: [PATCH] 本月额外收入
---
application/admin/controller/user/User.php | 2 ++
application/admin/lang/zh-cn/user/user.php | 3 ++-
application/admin/view/user/user/edit.html | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/application/admin/controller/user/User.php b/application/admin/controller/user/User.php
index aab62f9..60330a0 100644
--- a/application/admin/controller/user/User.php
+++ b/application/admin/controller/user/User.php
@@ -121,6 +121,8 @@ class User extends Backend
$this->error(__('No Results were found'));
}
$this->view->assign('groupList', build_select('row[group_id]', \app\admin\model\UserGroup::column('id,name'), $row['group_id'], ['class' => 'form-control selectpicker']));
+ $this->view->assign('start_time',date('Y-m-d',strtotime('-1month')));
+ $this->view->assign('end_time',date('Y-m-d',strtotime('0day')));
return parent::edit($ids);
}
diff --git a/application/admin/lang/zh-cn/user/user.php b/application/admin/lang/zh-cn/user/user.php
index 9ca00d0..4886342 100644
--- a/application/admin/lang/zh-cn/user/user.php
+++ b/application/admin/lang/zh-cn/user/user.php
@@ -43,5 +43,6 @@ return [
'Roledata' =>'角色',
'Roledata 0' =>'用户',
'Roledata 1' =>'合伙人',
- 'Idcard_front' => '收款码'
+ 'Idcard_front' => '收款码',
+ 'Join_time' => '入职时间'
];
diff --git a/application/admin/view/user/user/edit.html b/application/admin/view/user/user/edit.html
index 48a0c3e..c736881 100644
--- a/application/admin/view/user/user/edit.html
+++ b/application/admin/view/user/user/edit.html
@@ -29,7 +29,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Join_time')}:</label>
<div class="col-xs-12 col-sm-8">
- <input id="c-join_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[join_time]" type="text" value="{:$row.join_time?datetime($row.join_time):''}">
+ <input id="c-join_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-date-min-date="{$start_time}" data-date-max-date="{$end_time}" data-use-current="true" name="row[join_time]" type="text" value="{:$row.join_time?datetime($row.join_time):''}">
</div>
</div>
<div class="form-group">
--
libgit2 0.24.0