update
This commit is contained in:
parent
e38d737bbe
commit
cc8c3a9a4b
app/adminapi
controller/works
validate/works/finance
@ -5,6 +5,7 @@
|
||||
use app\adminapi\controller\BaseAdminController;
|
||||
use app\common\model\auth\Admin;
|
||||
use app\common\model\dept\Dept;
|
||||
use app\common\model\works\bgsp\OaFlow;
|
||||
use app\common\model\works\bgsp\OaFlowType;
|
||||
use think\facade\Db;
|
||||
|
||||
@ -61,6 +62,7 @@
|
||||
$copy_users = Admin::where('id','in',$data['copy_uids'])->column('name');
|
||||
$data['check_admin_users'] = !empty($check_admin_users) ? implode(',',$check_admin_users) : '';
|
||||
$data['copy_users'] = !empty($copy_users) ? implode(',',$copy_users) : '';
|
||||
$data['flow_info'] = OaFlow::where('id',$data['flow_id'])->findOrEmpty();
|
||||
$data['record'] = Db::name('oa_flow_record')->field('check_user_id,check_time,status,content')->where('action_id',$params['id'])->order('id desc')->select()->each(function($data){
|
||||
$data['check_time'] = date('Y-m-d H:i:s',$data['check_time']);
|
||||
$user = Admin::where('id',$data['check_user_id'])->value('name');
|
||||
@ -273,7 +275,6 @@
|
||||
if(empty($data)){
|
||||
return $this->fail('数据信息不存在');
|
||||
}
|
||||
$flow = Db::name('oa_flow')->where('id',$data['flow_id'])->find();
|
||||
//撤销
|
||||
if($params['check'] == 3){
|
||||
if($data['admin_id'] != $this->adminId){
|
||||
|
@ -2,7 +2,11 @@
|
||||
|
||||
namespace app\adminapi\controller\works\finance;
|
||||
|
||||
class ExpenseController
|
||||
use app\adminapi\controller\BaseAdminController;
|
||||
|
||||
class ExpenseController extends BaseAdminController
|
||||
{
|
||||
|
||||
public function add(){
|
||||
$params = $this->request->post(['code','income_month','expense_time','flow_id','check_admin_ids','copy_uids','annex','detail']);
|
||||
}
|
||||
}
|
33
app/adminapi/validate/works/finance/ExpenseValidate.php
Normal file
33
app/adminapi/validate/works/finance/ExpenseValidate.php
Normal file
@ -0,0 +1,33 @@
|
||||
<?php
|
||||
|
||||
namespace app\adminapi\validate\works\finance;
|
||||
|
||||
use app\common\validate\BaseValidate;
|
||||
|
||||
class ExpenseValidate extends BaseValidate
|
||||
{
|
||||
protected $rule = [
|
||||
'id' => 'require',
|
||||
'code' => 'require',
|
||||
'income_month' => 'require|dateFormat:Y-m',
|
||||
'expense_time' => 'require|dateFormat:Y-m-d',
|
||||
'flow_id' => 'require|checkFlow',
|
||||
'annex' => 'checkAnnex',
|
||||
'detail' => 'require|checkDetail',
|
||||
];
|
||||
|
||||
|
||||
/**
|
||||
* 参数描述
|
||||
* @var string[]
|
||||
*/
|
||||
protected $field = [
|
||||
'id' => 'require',
|
||||
'code' => 'require',
|
||||
'income_month' => 'require|dateFormat:Y-m',
|
||||
'expense_time' => 'require|dateFormat:Y-m-d',
|
||||
'flow_id' => 'require|checkFlow',
|
||||
'annex' => 'checkAnnex',
|
||||
'detail' => 'require|checkDetail',
|
||||
];
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user