Skip to content

O
OA
提交 a034afb1 authored 作者: wangkr's avatar wangkr
浏览文件
操作

合并分支 'test' 到 'release'

Test 查看合并请求 PHP/OA!30
上级 71537b7b 7149d468
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 259 行增加 和 28 行删除
.gitattributes deleted 100755 → 0
浏览文件 @ 71537b7b
config/config.php merge=ours
webmain/model/loginModel.php merge=ours
webmain/webmainConfig.php merge=ours
.idea/ merge=ours
images/OA二维码.png merge=ours
.gitattributes deleted 100755 → 0
浏览文件 @ 71537b7b
config/config.php merge=ours
webmain/model/loginModel.php merge=ours
webmain/webmainConfig.php merge=ours
.idea/ merge=ours
images/OA二维码.png merge=ours
webmain/flow/input/mode_contract_listAction.php
浏览文件 @ a034afb1
...@@ -48,9 +48,14 @@ class mode_contract_listClassAction extends inputAction{ ...@@ -48,9 +48,14 @@ class mode_contract_listClassAction extends inputAction{
$sql = ' number = "'.$numb .'"'; $sql = ' number = "'.$numb .'"';
$cdata = m($model)->getone($sql,'id,name'); $cdata = m($model)->getone($sql,'id,name');
if($cdata){
$sql = "select CONCAT('开户银行: ',`open_bank_name` ,' -- 银行账号: ',`bank_code` ) as `name`,`bank_code` as `value` from [Q]".$model."_bank_info where mid = ".$cdata['id']; $sql = "select CONCAT('开户银行: ',`open_bank_name` ,' -- 银行账号: ',`bank_code` ) as `name`,`bank_code` as `value` from [Q]".$model."_bank_info where mid = ".$cdata['id'];
$data = $this->db->getall($sql); $data = $this->db->getall($sql);
}else{
$data=[];
}
$this->returnjson($data); $this->returnjson($data);
} }
......
webmain/flow/input/mode_finfybxAction.php
浏览文件 @ a034afb1
...@@ -6,14 +6,23 @@ ...@@ -6,14 +6,23 @@
class mode_finfybxClassAction extends inputAction{ class mode_finfybxClassAction extends inputAction{
protected function savebefore($table, $arr, $id, $addbo){ // protected function savebefore($table, $arr, $id, $addbo){
// $cbzxid= $arr['cbzxid'];
// $model = 'c_fund_account';
// $sql = " cost_id ='$cbzxid' and status = 1 and is_default=1";
// $data = m($model)->getone($sql,'id,account_balance');
} // if(!$data){
// return "未检测到该成本中心默认扣款账户";
// }
// // if($data['account_balance'] < $arr['amountOfThisPayment']){
// // return "账户余额不足";
// // }
// }
protected function saveafter($table, $arr, $id, $addbo){
}
public function getlastAjax() public function getlastAjax()
{ {
......
webmain/flow/input/mode_oafkAction.php
浏览文件 @ a034afb1
...@@ -14,6 +14,20 @@ class mode_oafkClassAction extends inputAction{ ...@@ -14,6 +14,20 @@ class mode_oafkClassAction extends inputAction{
*/ */
protected function savebefore($table, $arr, $id, $addbo){ protected function savebefore($table, $arr, $id, $addbo){
// $cbzxid= $arr['cbzx_code'];
// $model = 'c_fund_account';
// $sql = " cost_id ='$cbzxid' and status = 1 and is_default=1";
// // var_dump($sql);die;
// $data = m($model)->getone($sql,'id,account_balance');
// if(!$data){
// return "未检测到该成本中心默认扣款账户";
// }
// if($data['account_balance'] < $arr['amountOfThisPayment']){
// return "账户余额不足";
// }
} }
/** /**
...@@ -23,9 +37,7 @@ class mode_oafkClassAction extends inputAction{ ...@@ -23,9 +37,7 @@ class mode_oafkClassAction extends inputAction{
* $id Int 对应表上记录Id * $id Int 对应表上记录Id
* $addbo Boolean 是否添加时 * $addbo Boolean 是否添加时
*/ */
protected function saveafter($table, $arr, $id, $addbo){
}
public function getbankinfoAjax() public function getbankinfoAjax()
{ {
......
webmain/flow/input/mode_oayfkAction.php
浏览文件 @ a034afb1
...@@ -14,17 +14,42 @@ class mode_oayfkClassAction extends inputAction{ ...@@ -14,17 +14,42 @@ class mode_oayfkClassAction extends inputAction{
*/ */
protected function savebefore($table, $arr, $id, $addbo){ protected function savebefore($table, $arr, $id, $addbo){
} // if($data['account_balance'] < $arr['amountOfThisPayment']){
// return "账户余额不足";
// }
/**
* 重写函数：保存后处理，主要保存其他表数据
* $table String 对应表名
* $arr Array 表单参数
* $id Int 对应表上记录Id
* $addbo Boolean 是否添加时
*/
protected function saveafter($table, $arr, $id, $addbo){
} }
// protected function savesubbefore($data,$tables){
// if($tables == 'c_fund_details_yfk'){
// if (count($data) > 1) {
// foreach ($data as $key => $value) {
// $cbzxid= $value['cbzx_code'];
// $model = 'c_fund_account';
// $sql = " cost_id ='$cbzxid' and status = 1 and is_default=1";
// $data = m($model)->getone($sql,'id,account_balance');
// if($data===false){
// return "未检测到该成本中心默认扣款账户";
// }
// }
// }else{
// $cbzxid= $data['cbzx_code'];
// $model = 'c_fund_account';
// $sql = " cost_id ='$cbzxid' and status = 1 and is_default=1";
// $data = m($model)->getone($sql,'id,account_balance');
// if($data===false){
// return "未检测到该成本中心默认扣款账户";
// }
// }
// }
// return $data;
// }
} }
\ No newline at end of file
webmain/model/1 deleted 100755 → 0
浏览文件 @ 71537b7b
差异被折叠。
webmain/model/flow/finfybxModel.php
浏览文件 @ a034afb1
...@@ -13,14 +13,70 @@ class flow_finfybxClassModel extends flowModel ...@@ -13,14 +13,70 @@ class flow_finfybxClassModel extends flowModel
{ {
$arr["$sid"] = "982"; $arr["$sid"] = "982";
$arr["$sna"] ="ε"; $arr["$sna"] ="εÑàéª";
} }
return $arr; return $arr;
} }
//流程全部完成后调用
protected function flowcheckfinsh($zt){
// 扣除账户余额 c_fund_account account_balance
$cbzxid= $this->rs['cbxmid'];
$model = 'c_fund_account';
$sql = " cost_id ='$cbzxid' and status = 1 and is_default=1";
$data = m($model)->getone($sql,'id,name,account_balance');
$zfarr = array(
'account_balance' =>$data['account_balance']-$this->rs['money'],
);
$id=$data['id'];
m('c_fund_account')->update($zfarr,"`id`='$id'");
// 成本中心 amount 变更
$cbzx = substr($cbzxid,0,strrpos($cbzxid,"（"));
$cbzxsql = " code ='$cbzx' and status = 1";
$cbzxdata = m('c_cbzx')->getone($cbzxsql,'id,amount');
$cbarr = array(
'amount' =>$cbzxdata['amount']+$this->rs['money'],
);
m('c_cbzx')->update($cbarr,"`code`='$cbzx'");
//账户明细 c_account_detail
$account_detail=array(
'account' => $data['name'],
'opt_type' => 2,
'amount' =>$this->rs['money'],
'trans_numb' => $this->rs['docnum'],
'account_balance' => $data['account_balance']-$this->rs['money'],
'create_time' =>date("Y-m-d H:i:s"),
'uid' =>$this->rs['uid'],
);
m('c_account_detail')->insert($account_detail);
// 业务付款8业务预付款10费用报销11 oa_c_fund_detail
$fund_detail=array(
'trans_numb' =>$this->rs['docnum'],
'account' => $data['name'],
'toaccount' =>'',
'trans_amount' =>$this->rs['money'],
'business_type' =>11,
'opt_type' =>2,
'account_balance'=>$data['account_balance']-$this->rs['money'],
'create_time' =>date("Y-m-d H:i:s"),
'uid' =>$this->rs['uid'],
);
m('c_fund_detail')->insert($fund_detail);
}
} }
\ No newline at end of file
webmain/model/flow/fund_depositModel.php
浏览文件 @ a034afb1
...@@ -42,6 +42,7 @@ class flow_fund_depositClassModel extends flowModel ...@@ -42,6 +42,7 @@ class flow_fund_depositClassModel extends flowModel
'account_balance' =>$data['account_balance']+$this->rs['trans_amount'], 'account_balance' =>$data['account_balance']+$this->rs['trans_amount'],
'trans_numb' => $this->rs['trans_numb'], 'trans_numb' => $this->rs['trans_numb'],
'create_time' =>$this->rs['create_time'], 'create_time' =>$this->rs['create_time'],
'uid' =>$this->rs['uid'],
); );
m('c_account_detail')->insert($toacc_detail); m('c_account_detail')->insert($toacc_detail);
......
webmain/model/flow/fund_transferModel.php
浏览文件 @ a034afb1
...@@ -76,6 +76,7 @@ class flow_fund_transferClassModel extends flowModel ...@@ -76,6 +76,7 @@ class flow_fund_transferClassModel extends flowModel
'account_balance' =>$data['account_balance']-$this->rs['trans_amount'], 'account_balance' =>$data['account_balance']-$this->rs['trans_amount'],
'trans_numb' => $this->rs['trans_numb'], 'trans_numb' => $this->rs['trans_numb'],
'create_time' =>$this->rs['create_time'], 'create_time' =>$this->rs['create_time'],
'uid' =>$this->rs['uid'],
); );
m('c_account_detail')->insert($acc_detail); m('c_account_detail')->insert($acc_detail);
...@@ -86,6 +87,7 @@ class flow_fund_transferClassModel extends flowModel ...@@ -86,6 +87,7 @@ class flow_fund_transferClassModel extends flowModel
'account_balance' =>$toaccount_list['account_balance']+$this->rs['trans_amount'], 'account_balance' =>$toaccount_list['account_balance']+$this->rs['trans_amount'],
'trans_numb' => $this->rs['trans_numb'], 'trans_numb' => $this->rs['trans_numb'],
'create_time' =>$this->rs['create_time'], 'create_time' =>$this->rs['create_time'],
'uid' =>$this->rs['uid'],
); );
m('c_account_detail')->insert($toacc_detail); m('c_account_detail')->insert($toacc_detail);
......
webmain/model/flow/oafkModel.php
浏览文件 @ a034afb1
...@@ -8,4 +8,66 @@ class flow_oafkClassModel extends flowModel ...@@ -8,4 +8,66 @@ class flow_oafkClassModel extends flowModel
if($rs['contractNumber']) $rs['contractNumber'] = $this->getContractByTag($rs['contractNumber']); if($rs['contractNumber']) $rs['contractNumber'] = $this->getContractByTag($rs['contractNumber']);
return $rs; return $rs;
} }
//流程全部完成后调用
protected function flowcheckfinsh($zt){
$mid= $this->rs['id'];
$datafk = m('c_fund_details_fk')->getall('mid='.$mid);
foreach ($datafk as $key => $value) {
// 扣除账户余额 c_fund_account account_balance
$cbzxid= $value['cbzx_code'];
$model = 'c_fund_account';
$sql = " cost_id ='$cbzxid' and status = 1 and is_default=1";
$data = m($model)->getone($sql,'id,name,account_balance');
$zfarr = array(
'account_balance' =>$data['account_balance']-$value['charge_amount'],
);
$id=$data['id'];
m('c_fund_account')->update($zfarr,"`id`='$id'");
// 成本中心 amount 变更
$cbzx = substr($cbzxid,0,strrpos($cbzxid,"（"));
$cbzxsql = " code ='$cbzx' and status = 1";
$cbzxdata = m('c_cbzx')->getone($cbzxsql,'id,amount');
$cbarr = array(
'amount' =>$cbzxdata['amount']+$value['charge_amount'],
);
m('c_cbzx')->update($cbarr,"`code`='$cbzx'");
//账户明细 c_account_detail
$account_detail=array(
'account' => $data['name'],
'opt_type' => 2,
'amount' =>$value['charge_amount'],
'trans_numb' => $this->rs['docnum'],
'account_balance' => $data['account_balance']-$value['charge_amount'],
'create_time' =>date("Y-m-d H:i:s"),
'uid' =>$this->rs['uid'],
);
m('c_account_detail')->insert($account_detail);
// 业务付款8业务预付款10费用报销11 oa_c_fund_detail
$fund_detail=array(
'trans_numb' =>$this->rs['docnum'],
'account' => $data['name'],
'toaccount' =>$this->rs['payee'],
'trans_amount' =>$value['charge_amount'],
'business_type' =>8,
'opt_type' =>2,
'account_balance'=>$data['account_balance']-$value['charge_amount'],
'create_time' =>date("Y-m-d H:i:s"),
'uid' =>$this->rs['uid'],
);
m('c_fund_detail')->insert($fund_detail);
}
}
} }
\ No newline at end of file
webmain/model/flow/oayfkModel.php
浏览文件 @ a034afb1
...@@ -8,4 +8,66 @@ class flow_oayfkClassModel extends flowModel ...@@ -8,4 +8,66 @@ class flow_oayfkClassModel extends flowModel
if($rs['contractNumber']) $rs['contractNumber'] = $this->getContractByTag($rs['contractNumber']); if($rs['contractNumber']) $rs['contractNumber'] = $this->getContractByTag($rs['contractNumber']);
return $rs; return $rs;
} }
//流程全部完成后调用
protected function flowcheckfinsh($zt){
$mid= $this->rs['id'];
$datafk = m('c_fund_details_yfk')->getall('mid='.$mid);
foreach ($datafk as $key => $value) {
// 扣除账户余额 c_fund_account account_balance
$cbzxid= $value['cbzx_code'];
$model = 'c_fund_account';
$sql = " cost_id ='$cbzxid' and status = 1 and is_default=1";
$data = m($model)->getone($sql,'id,name,account_balance');
$zfarr = array(
'account_balance' =>$data['account_balance']-$value['charge_amount'],
);
$id=$data['id'];
m('c_fund_account')->update($zfarr,"`id`='$id'");
// 成本中心 amount 变更
$cbzx = substr($cbzxid,0,strrpos($cbzxid,"（"));
$cbzxsql = " code ='$cbzx' and status = 1";
$cbzxdata = m('c_cbzx')->getone($cbzxsql,'id,amount');
$cbarr = array(
'amount' =>$cbzxdata['amount']+$value['charge_amount'],
);
m('c_cbzx')->update($cbarr,"`code`='$cbzx'");
//账户明细 c_account_detail
$account_detail=array(
'account' => $data['name'],
'opt_type' => 2,
'amount' =>$value['charge_amount'],
'trans_numb' => $this->rs['docnum'],
'account_balance' => $data['account_balance']-$value['charge_amount'],
'create_time' =>date("Y-m-d H:i:s"),
'uid' =>$this->rs['uid'],
);
m('c_account_detail')->insert($account_detail);
// 业务付款8业务预付款10费用报销11 oa_c_fund_detail
$fund_detail=array(
'trans_numb' =>$this->rs['docnum'],
'account' => $data['name'],
'toaccount' =>$this->rs['payee'],
'trans_amount' =>$value['charge_amount'],
'business_type' =>10,
'opt_type' =>2,
'account_balance'=>$data['account_balance']-$value['charge_amount'],
'create_time' =>date("Y-m-d H:i:s"),
'uid' =>$this->rs['uid'],
);
m('c_fund_detail')->insert($fund_detail);
}
}
} }
\ No newline at end of file
webmain/model/loginModel.php
浏览文件 @ a034afb1
...@@ -298,7 +298,10 @@ class loginClassModel extends Model ...@@ -298,7 +298,10 @@ class loginClassModel extends Model
//删除redis //删除redis
$redis = new Redis(); $redis = new Redis();
$redis->connect('192.168.1.70',6379); $host = getconfig("redis_host");
$port = getconfig("redis_port");
$redis->connect($host,$port);
$sid = 'PHPREDIS_SESSION:'.$cookieSid; $sid = 'PHPREDIS_SESSION:'.$cookieSid;
$redis->delete($sid); $redis->delete($sid);
$redis->close(); $redis->close();
......
webmain/model/loginModel.php.bak deleted 100755 → 0
浏览文件 @ 71537b7b
差异被折叠。
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论