Merge branch 'test' of ssh://39.155.253.71:33222/PHP/OA into test

README.md

@@ -57,4 +57,5 @@
 14、nwjs的PC客户端框架：https://nwjs.io/  
 15、iconfont图标库：http://www.iconfont.cn/   
 16、腾讯地图：http://map.qq.com/  
-16、nodejs：https://nodejs.org/ 
+16、nodejs：https://nodejs.org/ 
\ No newline at end of file
+17
\ No newline at end of file

webmain/flow/input/inputjs/mode_goodly.js

@@ -22,7 +22,7 @@ function initbodys(){
 		for(i=0;i<da.length;i++){
 			d  = da[i];
 			bo = false;
-			for(j=0;j<dao.length;j++)if(dao[j].aid==d.value)bo=true;
+			// for(j=0;j<dao.length;j++)if(dao[j].aid==d.value)bo=true;
 			oii++;
 			if(!bo){
 				if(oii>0){
@@ -38,15 +38,16 @@ function initbodys(){
 					aid:d.value
 				});
 				$(form('count'+nam[2]+'')).attr('max', d.stock);
-			}else{
-				oii--;
-				if(i==0){
-					this.setrowdata(nam[0],nam[1],{
-						temp_aid:'',
-						aid:'0'
-					});
-				}
-			}	
+			}
+			// else{
+			// 	oii--;
+			// 	if(i==0){
+			// 		this.setrowdata(nam[0],nam[1],{
+			// 			temp_aid:'',
+			// 			aid:'0'
+			// 		});
+			// 	}
+			// }	
 		}
 	}
 }

webmain/flow/input/mode_finfybxAction.php

@@ -6,14 +6,23 @@
 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()
 	{

webmain/flow/input/mode_goodlyAction.php

@@ -10,11 +10,11 @@ class mode_goodlyClassAction extends inputAction{
 		$this->sssaid = '0';
 		foreach($data as $k=>$rs){
 			if($rs['count']==0)return '行['.($k+1).']的数量不能为0';
-			if(!isset($cbarr[$rs['aid']])){
-				$cbarr[$rs['aid']] = 1;
-			}else{
-				return '行['.($k+1).']的物品已申请了';
-			}
+			// if(!isset($cbarr[$rs['aid']])){
+			// 	$cbarr[$rs['aid']] = 1;
+			// }else{
+			// 	return '行['.($k+1).']的物品已申请了';
+			// }
 			$this->sssaid.=','.$rs['aid'].'';
 		}
 	}

webmain/flow/input/mode_oafkAction.php

@@ -13,7 +13,21 @@ class mode_oafkClassAction extends inputAction{
 	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
 	*/
 	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{
 	*	$id Int 对应表上记录Id
 	*	$addbo Boolean 是否添加时
 	*/	
-	protected function saveafter($table, $arr, $id, $addbo){
-		
-	}
+
 
 	public function getbankinfoAjax()
     {

webmain/flow/input/mode_oayfkAction.php

@@ -12,19 +12,44 @@ class mode_oayfkClassAction extends inputAction{
 	*	$addbo Boolean 是否添加时
 	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
 	*/
-	protected function savebefore($table, $arr, $id, $addbo){
-		
+		protected function savebefore($table, $arr, $id, $addbo){
+
+		   //  if($data['account_balance'] < $arr['amountOfThisPayment']){
+		    	          
+     //           return "账户余额不足";
+		   // }
+
+
 	}
+
+	 // 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;	
+
+	 // }
+
+
 	
-	/**
-	*	重写函数：保存后处理，主要保存其他表数据
-	*	$table String 对应表名
-	*	$arr Array 表单参数
-	*	$id Int 对应表上记录Id
-	*	$addbo Boolean 是否添加时
-	*/	
-	protected function saveafter($table, $arr, $id, $addbo){
-		
-	}
 }	
 			
\ No newline at end of file

webmain/model/flow/finfybxModel.php

@@ -13,14 +13,70 @@ class flow_finfybxClassModel extends flowModel
    	   {
    	   	
    	   	$arr["$sid"]  = "982";
-   	   	$arr["$sna"] ="ε";
+   	   	$arr["$sna"] ="εÑàéª";
    	   	    
    	   	}
 
    	   	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

@@ -18,19 +18,19 @@ class flow_fund_depositClassModel extends flowModel
 
 	//提交时调用
 	protected function flowsubmit($na, $sm){
-	$name=$this->rs['toaccount'];
-	$data=m('c_fund_account')->getone("`name`='$name'");
-    $zfarr = array(
-                'account_balance'        =>$this->rs['trans_amount']+$data['account_balance'],
-                );
-
-    m('c_fund_account')->update($zfarr,"`name`='$name'");
-	$id=$this->rs['id'];
-	$account_balance=$this->rs['trans_amount']+$data['account_balance'];//当前余额
-	$detail = array(
-	'account_balance'        =>$account_balance,
-	);
-	m('c_fund_detail')->update($detail,"`id`='$id'");
+    	$name=$this->rs['toaccount'];
+    	$data=m('c_fund_account')->getone("`name`='$name'");
+        $zfarr = array(
+                    'account_balance'        =>$this->rs['trans_amount']+$data['account_balance'],
+                    );
+
+        m('c_fund_account')->update($zfarr,"`name`='$name'");
+    	$id=$this->rs['id'];
+    	$account_balance=$this->rs['trans_amount']+$data['account_balance'];//当前余额
+    	$detail = array(
+    	'account_balance'        =>$account_balance,
+    	);
+    	m('c_fund_detail')->update($detail,"`id`='$id'");
 	                 
 	
 
@@ -42,6 +42,7 @@ class flow_fund_depositClassModel extends flowModel
                     'account_balance'        =>$data['account_balance']+$this->rs['trans_amount'],
                     'trans_numb'        => $this->rs['trans_numb'],
                     'create_time'  =>$this->rs['create_time'],
+                     'uid'  =>$this->rs['uid'],
             );
                 m('c_account_detail')->insert($toacc_detail);
 

webmain/model/flow/fund_transferModel.php

@@ -76,6 +76,7 @@ class flow_fund_transferClassModel extends flowModel
                     'account_balance'        =>$data['account_balance']-$this->rs['trans_amount'],
                     'trans_numb'        => $this->rs['trans_numb'],
                     'create_time'  =>$this->rs['create_time'],
+                    'uid'  =>$this->rs['uid'],
             );
                 m('c_account_detail')->insert($acc_detail);
 
@@ -86,6 +87,7 @@ class flow_fund_transferClassModel extends flowModel
                     'account_balance'        =>$toaccount_list['account_balance']+$this->rs['trans_amount'],
                     'trans_numb'        => $this->rs['trans_numb'],
                     'create_time'  =>$this->rs['create_time'],
+                    'uid'  =>$this->rs['uid'],
             );
                 m('c_account_detail')->insert($toacc_detail);
 

webmain/model/flow/oafkModel.php

@@ -8,4 +8,66 @@ class flow_oafkClassModel extends flowModel
         if($rs['contractNumber']) $rs['contractNumber'] = $this->getContractByTag($rs['contractNumber']);
         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

@@ -8,4 +8,66 @@ class flow_oayfkClassModel extends flowModel
         if($rs['contractNumber']) $rs['contractNumber'] = $this->getContractByTag($rs['contractNumber']);
         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/public/upload/uploadAction.php

-<?php 
-class uploadClassAction extends Action{
-	
-	/**
-	*	上传文件页面
-	*/
-	public function defaultAction()
-	{
-		$callback	= $this->get('callback');
-		$callbacka	= explode('|', $callback);
-		
-		$params['callback'] 	= $callbacka[0];
-		$params['changeback'] 	= arrvalue($callbacka,1);
-		$params['maxup'] 		= $this->get('maxup','0');
-		$params['thumbnail'] 	= $this->get('thumbnail');
-		$params['maxwidth'] 	= $this->get('maxwidth','0');
-		$params['showid'] 		= $this->get('showid');
-		$params['upkey'] 		= $this->get('upkey');
-		$params['uptype'] 		= $this->get('uptype','*');
-		$params['thumbtype'] 	= $this->get('thumbtype','0');
-		$params['maxsize'] 		= (int)$this->get('maxsize', c('upfile')->getmaxzhao());
-		
-		$urlparams				= '{}';
-		$urlcan	 = $this->get('urlparams');//格式:a=b,c=d
-		if(!isempt($urlcan)){
-			$cans1 = explode(',', $urlcan);
-			$urlparams = array();
-			foreach($cans1 as $cans2){
-				$cans3 = explode(':', $cans2);
-				$urlparams[$cans3[0]]=$cans3[1];
-			}
-			$urlparams = json_encode($urlparams);
-		}
-		$params['urlparams'] 	= $urlparams;
-		
-		$this->title 			= $this->get('title','文件上传');
-		$this->assign('params', $params);
-		$this->assign('callback', $params['callback']);
-	}
-	
-	public function upfileAjax()
-	{
-		if(!$_FILES)exit('sorry!');
-		$upimg	= c('upfile');
-		$maxsize= (int)$this->get('maxsize', 5);
-		$uptype	= $this->get('uptype', '*');
-		$thumbnail	= $this->get('thumbnail');
-		$upimg->initupfile($uptype, ''.UPDIR.'|'.date('Y-m').'', $maxsize);
-		$upses	= $upimg->up('file');
-		$arr 	= c('down')->uploadback($upses, $thumbnail, false);
-		$this->returnjson($arr);
-	}
-	
-	
-	
-	/**
-	*	获取文件
-	*/
-	public function getfileAjax()
-	{
-		$mtype		= $this->request('mtype');
-		$mid		= (int)$this->request('mid');
-		$rows 		= m('file')->getfiles($mtype, $mid);
-		echo json_encode($rows);
-	}
-	
-	/**
-	*	删除文件
-	*/
-	public function delfileAjax()
-	{
-		$id		= (int)$this->request('id','0');
-		m('file')->delfile($id);
-	}
-	
-	public function showAction()
-	{
-		$id		= (int)$this->get('id','0');
-		$this->display = false;
-		m('file')->show($id);
-	}
-	
-	/**
-	*	编辑器上传文件
-	*/
-	public function upimgAction()
-	{
-		$this->display = false;
-		$upfile = c('upfile');
-		$upfile->initupfile('jpg|png|gif|jpeg',''.UPDIR.'|'.date('Y-m').'', 5);
-		$upses	= $upfile->up('imgFile');
-		if(is_array($upses)){
-			$url = $upses['allfilename'];
-			$url = str_replace('../' , '', $url);
-			$arr = array('error' => 0, 'url' => $url);
-		}else{
-			$arr = array('error' => 1, 'message' => $upses);
-		}
-		$this->returnjson($arr);
-	}
-}
\ No newline at end of file