update

.gitattributes

-/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

-config/config.php merge=ours
-webmain/model/loginModel.php merge=ours
-webmain/webmainConfig.php merge=ours
-.idea/ merge=ours
-images/OA二维码.png merge=ours

.gitignore

 /upload/*
-/config/config.php
-/webmain/webmainConfig.php
 /.idea/
 /images/OA二维码.png

config/config.php

+<?php
+/**
+*	来自：信呼开发团队
+*	作者：磐石(rainrock)
+*	网址：http://www.rockoa.com/
+*	系统默认配置文件，请不要去修改
+*	要修改配置文件在：webmain/webmainConfig.php
+*/
+
+$redisConfig = require_once 'redis_config.php';
+//调整session为redis
+ini_set('session.save_handler', $redisConfig['save_handler']);
+ini_set('session.save_path', $redisConfig['save_path']);
+ini_set('session.cookie_path', $redisConfig['cookie_path']);
+ini_set('session.cookie_domain', $redisConfig['cookie_domain']);
+ini_set('session.cookie_lifetime', $redisConfig['cookie_lifetime']);
+
+@session_start();
+if(function_exists('date_default_timezone_set'))date_default_timezone_set('Asia/Shanghai'); //设置默认时区
+header('Content-Type:text/html;charset=utf-8');
+define('ROOT_PATH',str_replace('\\','/',dirname(dirname(__FILE__))));	//系统跟目录路径
+
+include_once(''.ROOT_PATH.'/include/rockFun.php');
+include_once(''.ROOT_PATH.'/include/Chajian.php');
+include_once(''.ROOT_PATH.'/include/class/rockClass.php');
+$rock 		= new rockClass();
+
+$db			= null;		
+$smarty		= false;
+define('HOST', $rock->host);
+define('REWRITE', 'true');
+if(!defined('PROJECT'))define('PROJECT', $rock->get('p', 'webmain'));
+if(!defined('ENTRANCE'))define('ENTRANCE', 'index');
+
+$config		= array(
+	'title'		=> '信呼',
+	'url'		=> '',
+	'urly'		=> 'http://www.rockoa.com/',	//官网域名地址，修改后就无法提供在线升级了。
+	'db_host'	=> '127.0.0.1',
+	'db_user'	=> 'root',
+	'db_pass'	=> '',
+	'db_base'	=> '',
+	'perfix'	=> '',
+	'qom'		=> '',
+	'highpass'	=> '',
+	'install'	=> false,
+	'version'	=> require('version.php'),
+	'path'		=> 'index',
+	'updir'		=> 'upload',
+	'dbencrypt'	=> false,
+	'sqllog'	=> false,
+	'checksign'	=> false,			//列表请求是否验证
+	'memory_limit'	=> '',			//运行内存大小
+	'timeout'		=> -1,			//抄送时间(秒),-1默认的
+	'db_drive'		=> 'mysqli',	//数据库操作驱动
+	'db_engine'		=> 'MyISAM',	//数据库默认引擎
+	'debug'			=> true,	//默认debug模式
+	'reim_show' 	=> true,	//首页是否显示REIM
+	'mobile_show' 	=> true,	//首页是否显示手机版
+	'accesslogs' 	=> false,	//是否记录访问日志和限制IP
+	'upurl'			=> '', 		//上传文件附件地址(还不能使用)
+	'authorkey'		=> '', 		//系统授权的key，请联系官网获取
+	'companymode'	=> false, 	//是否开启多单位模式切换
+   
+);
+
+$defaultConfig = require_once 'default_config.php';
+
+$config = array_merge($config,$defaultConfig);
+
+//引入配置文件
+$_confpath		= $rock->strformat('?0/?1/?1Config.php', ROOT_PATH, PROJECT);
+if(file_exists($_confpath)){
+	$_tempconf	= require($_confpath);
+	foreach($_tempconf as $_tkey=>$_tvs)$config[$_tkey] = $_tvs;
+	if(isempt($config['url']))$config['url'] = $rock->url();
+	if(!isempt($config['memory_limit']) && function_exists('ini_set'))
+		ini_set('memory_limit', $config['memory_limit']);
+	if($config['timeout']>-1 && function_exists('set_time_limit'))set_time_limit($config['timeout']);	
+}
+$_confpath	= ''.ROOT_PATH.'/config/author.php';
+if(file_exists($_confpath)){
+	$config['authorkey'] = require($_confpath);
+}
+
+define('DEBUG', $config['debug']);
+error_reporting(DEBUG ? E_ALL : 0);
+
+define('TITLE', $config['title']);
+define('URL', $config['url']);
+define('URLY', $config['urly']);
+define('PATH', $config['path']);
+
+define('DB_DRIVE', $config['db_drive']);
+define('DB_HOST', $config['db_host']);
+define('DB_USER', $config['db_user']);
+define('DB_PASS', $config['db_pass']);
+define('DB_BASE', $config['db_base']);
+
+define('UPDIR', $config['updir']);
+define('PREFIX', $config['perfix']);
+define('QOM', $config['qom']);
+define('VERSION', $config['version']);
+define('HIGHPASS', $config['highpass']);
+define('SYSURL', ''.URL.PATH.'.php');
+define('UPURL', $config['upurl']);
+define('ISMORECOM', $config['companymode']);
+define('ENCRYPT_KEY',$config['encrypt_key']);
+
+$_confpath	= ''.ROOT_PATH.'/config/iplogs.php'; //这个用来限制IP访问的
+if(file_exists($_confpath))include_once($_confpath);
+$rock->initRock();

custmoer.txt

@@ -49,4 +49,36 @@
 客户编号：CUST24067保存接口成功  执行时间：0.32573699951172 s
 客户编号：CUST24067提交接口成功  执行时间：0.057328939437866 s
 客户编号：CUST24067审核接口成功  执行时间：0.12728691101074 s
-客户名称：无与伦比（北京）国际拍卖有限公司保存接口失败  
+客户名称：无与伦比（北京）国际拍卖有限公司保存接口失败  客户编号：CUST24069保存接口成功  执行时间：0.37844705581665 s
\ No newline at end of file
+客户编号：CUST24069提交接口成功  执行时间：0.70342779159546 s
+客户编号：CUST24069审核接口成功  执行时间：0.1454861164093 s
+客户名称：中移铁通有限公司佛山分公司保存接口失败  客户编号：CUST24071保存接口成功  执行时间：1.6227650642395 s
+客户编号：CUST24071提交接口成功  执行时间：1.7524421215057 s
+客户编号：CUST24071审核接口成功  执行时间：0.17819809913635 s
+客户编号：CUST24072保存接口成功  执行时间：1.9027919769287 s
+客户编号：CUST24072提交接口成功  执行时间：1.0832619667053 s
+客户编号：CUST24072审核接口成功  执行时间：0.17445397377014 s
+客户编号：CUST24073保存接口成功  执行时间：1.0200901031494 s
+客户编号：CUST24073提交接口成功  执行时间：0.055791139602661 s
+客户编号：CUST24073审核接口成功  执行时间：0.1040461063385 s
+客户编号：CUST24074保存接口成功  执行时间：0.31467390060425 s
+客户编号：CUST24074提交接口成功  执行时间：0.058095932006836 s
+客户编号：CUST24074审核接口成功  执行时间：0.12728404998779 s
+客户名称：廷禄（北京）科技有限公司保存接口失败  客户编号：CUST24076保存接口成功  执行时间：4.7699458599091 s
+客户编号：CUST24076提交接口成功  执行时间：1.1794610023499 s
+客户编号：CUST24076审核接口成功  执行时间：0.1659779548645 s
+客户名称：北京数字谷科技发展集团有限公司保存接口失败  客户编号：CUST24079保存接口成功  执行时间：1.458643913269 s
+客户编号：CUST24079提交接口成功  执行时间：0.080422878265381 s
+客户编号：CUST24079审核接口成功  执行时间：0.14759802818298 s
+客户名称：北京友和力达信息技术有限公司保存接口失败  会话信息已丢失，请重新登录客户名称：中金招标有限责任公司保存接口失败  会话信息已丢失，请重新登录客户名称：北京思华通达科技有限公司保存接口失败  会话信息已丢失，请重新登录客户名称：慕欣（北京）餐饮管理有限公司保存接口失败  会话信息已丢失，请重新登录客户名称：北京聚力瑞更体育发展有限公司保存接口失败  会话信息已丢失，请重新登录客户名称：北京雨华波腾贸易有限公司保存接口失败  会话信息已丢失，请重新登录客户编号：CUST24080保存接口成功  执行时间：1.0314121246338 s
+客户编号：CUST24080提交接口成功  执行时间：0.11266589164734 s
+客户编号：CUST24080审核接口成功  执行时间：0.086367845535278 s
+客户编号：CUST24081保存接口成功  执行时间：0.68517708778381 s
+客户编号：CUST24081提交接口成功  执行时间：0.076663017272949 s
+客户编号：CUST24081审核接口成功  执行时间：0.079483985900879 s
+客户名称：广东晖腾投资发展有限公司保存接口失败  客户编号：CUST24083保存接口成功  执行时间：0.36671996116638 s
+客户编号：CUST24083提交接口成功  执行时间：1.4404518604279 s
+客户编号：CUST24083审核接口成功  执行时间：0.11111688613892 s
+客户编号：CUST24084保存接口成功  执行时间：0.42191791534424 s
+客户编号：CUST24084提交接口成功  执行时间：0.082257032394409 s
+客户编号：CUST24084审核接口成功  执行时间：0.075235843658447 s

webmain/flow/input/inputjs/mode_assetmnew.js

+//流程模块【assetmnew.固定资产】下录入页面自定义js页面,初始函数
+function initbodys(){
+	
+}
\ No newline at end of file

webmain/flow/input/inputjs/mode_assetmuse.js

 //流程模块【assetmuse.固定资产申领】下录入页面自定义js页面,初始函数
 function initbodys(){
-  
-
-
-      c.onselectdata['assetmnumb']=function(d){
-       
-          
-
-            js.ajax(geturlact('getassetmnumb'),{numb:d.value},function(ret){
+      c.onselectdata['num']=function(d){
+            js.ajax(geturlact('getnum'),{numb:d.value},function(ret){
                 if(ret.length == 0) {
                     return '未找到信息';
                 }
-               $('input[name="assetmname"]').val(ret.title);
-               $('input[name="assetmbuydate"]').val(ret.buydt);
-               $('input[name="assetmprice"]').val(ret.price);
-               $('textarea[name="assetmdetail"]').text(ret.info);
+               $('input[name="asset"]').val(ret.title);
+               $('input[name="buydate"]').val(ret.buydt);
+               $('input[name="price"]').val(ret.price);
+               $('textarea[name="info"]').text(ret.info);
             },'post,json');
-        
+
     };
 }
\ No newline at end of file

webmain/flow/input/mode_assetmnewAction.php

+<?php
+/**
+*	此文件是流程模块【assetmnew.固定资产】对应控制器接口文件。
+*/ 
+class mode_assetmnewClassAction extends inputAction{
+	
+	/**
+	*	重写函数：保存前处理，主要用于判断是否可以保存
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id 0添加时，大于0修改时
+	*	$addbo Boolean 是否添加时
+	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
+	*/
+	protected function savebefore($table, $arr, $id, $addbo){
+		
+	}
+	
+	/**
+	*	重写函数：保存后处理，主要保存其他表数据
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id
+	*	$addbo Boolean 是否添加时
+	*/	
+	protected function saveafter($table, $arr, $id, $addbo){
+		
+	}
+}	
+			
\ No newline at end of file

webmain/flow/input/mode_assetmuseAction.php

@@ -28,11 +28,9 @@ class mode_assetmuseClassAction extends inputAction{
 	}
 
 
-	 public function getassetmnumbAjax(){
+	 public function getnumAjax(){
         $numb = $this->post('numb');
-
-       
-        $data = m('assetm')->getone('id = '.$numb,"title,price,buydt,CONCAT('型号：',`model-xh`,'   机器编号:',`model-bh`,'   处理器(CPU):',`model-cpu`,'  内存：',`model-ram`,'   硬盘:',`model-hdd`,'   显卡:',`model-vc`,'   操作系统:',`model-os`) as info");
+        $data = m('assetm')->getone('id = '.$numb,"title,price,buydt,CONCAT('型号：',`model_type`,'   机器编号:',IFNULL(`model_id`,' 未知 '),'   处理器(CPU):',IFNULL(`model_cpu`,' 未知 '),'  内存：',IFNULL(`model_ram`,' 未知 '),'   硬盘:',IFNULL(`model_hdd`,' 未知 '),'   显卡:',IFNULL(`model_vc`,'集成显卡'),'   操作系统:',IFNULL(`model_os`,' 未知 ')) as info");
         $this->returnjson($data);
 	}
 }	

webmain/flow/input/mode_fund_transferAction.php

@@ -61,10 +61,21 @@ class mode_fund_transferClassAction extends inputAction{
 			$numb = $this->get('account');
 			$model = 'c_fund_account';
 			$sql = " id =$numb";
-			$cdata = m($model)->getone($sql,'id,name,level');
-			$level=$cdata['level'];
-			$levelto=$cdata['level']+1;
-			$sqla = " id !=$numb and level =$level or level =$levelto";
+			$cdata = m($model)->getone($sql,'id,name,pid,level');
+			if($cdata['level']==1){
+				$level=$cdata['level'];
+				$levelto=$cdata['level']+1;
+				$sqla = " id !=$numb and level =$level or level =$levelto";
+			}elseif($cdata['level']==2){
+    
+				$sqla = " id !=$numb and (level =1 or level =2 or pid= $numb)";
+			}else{
+				$pid=$cdata['pid'];
+               $sqla = "  id !=$numb and pid=$pid or id=$pid";
+
+			}
+           
+			
 			$data = m($model)->getall($sqla,'id as value,name');
         $this->returnjson($data);
     }

webmain/flow/page/input_assetmnew.html

+<p><span style="font-size:small;"><br /></span> <table width="100%" class="ke-zeroborder" bordercolor="#000000" border="0"><tbody><tr><td height="34" align="right" class="ys1">*资产编号</td><td class="ys2">{num}</td><td align="right" class="ys1"><span style="text-indent:28px;font-size:small;white-space:normal;">*状态</span><br /></td><td class="ys2"><span style="text-indent:28px;font-size:small;white-space:normal;">{state}</span><br /></td></tr><tr><td height="34" align="right" class="ys1">*资产分类</td><td class="ys2">{typeid}</td><td class="ys2" style="text-align:right;">资产来源</td><td class="ys2"><span style="text-indent:28px;white-space:normal;">{source}</span><br /></td></tr><tr><td height="34" align="right" class="ys1"><span style="white-space:normal;">使用人</span><br /></td><td class="ys2"><span style="white-space:normal;">{usename}</span> </td><td align="right" class="ys1"><span style="white-space:normal;">使用人部门</span><br /></td><td class="ys2"><span style="white-space:normal;">{deptname}</span> </td></tr><tr><td width="15%" height="34" align="right" class="ys1">*资产名称<br /></td><td width="35%" class="ys2">{title}</td><td width="15%" align="right" class="ys1">*价格<br /></td><td width="35%" class="ys2"><span style="white-space:normal;">{price}</span><br /></td></tr><tr><td height="34" align="right" class="ys1">*所属公司名称<br /></td><td class="ys2">{company}</td><td align="right" class="ys1">oa号<br /></td><td class="ys2">{oanum}</td></tr><tr><td height="34" align="right" class="ys1">使用人更迭记录</td><td class="ys2">{log}</td><td align="right" class="ys1">最近使用人更迭日期</td><td class="ys2">{changedt}</td></tr><tr><td class="ys1" style="text-align:right;">*购进日期<br /></td><td class="ys2" colspan="3"><span style="text-indent:28px;white-space:normal;">{buydt}</span><br /></td></tr><tr><td class="ys2" style="background-color:#CCCCCC;" colspan="4"><p><strong>详细信息</strong> </p></td></tr><tr><td height="34" align="right" class="ys1"><span style="white-space:normal;">*型号</span> </td><td class="ys2" colspan="3"><span style="white-space:normal;">{model_type}</span> </td></tr><tr><td class="ys1" style="text-align:right;">*机器编号<br /></td><td class="ys1">{model_id}<br /></td><td class="ys1" style="text-align:right;"><span style="text-indent:2em;">处理器(CPU)</span><span style="text-indent:2em;"></span> </td><td class="ys1">{model_cpu}<br /></td></tr><tr><td class="ys1" style="text-align:right;">内存<br /></td><td class="ys1">{model_ram}<br /></td><td class="ys1" style="text-align:right;">硬盘<br /></td><td class="ys1">{model_hdd}<br /></td></tr><tr><td class="ys1" style="text-align:right;">显卡<br /></td><td class="ys1">{model_vc}</td><td class="ys1" style="text-align:right;">操作系统<br /></td><td class="ys1">{model_os}<br /></td></tr></tbody></table></p><audio controls="controls" style="display:none;"></audio>
\ No newline at end of file

webmain/flow/page/input_assetmuse.html

-<p><br /><table class="" border="1" bordercolor="#000000" style="width:100%;"><tbody><tr><td class="ys1" height="34" align="right" width="15%" style="text-align:center;width:15%;height:34px;background-color:#CCCCCC;">*申领人</td><td class="ys2" width="35%">{applicant}</td><td class="ys1" align="right" width="15%" style="text-align:center;width:15%;background-color:#CCCCCC;">*申领人部门</td><td class="ys2" width="35%">{applicantdept}</td></tr><tr><td class="ys1" height="34" align="right" style="text-align:center;height:34px;background-color:#CCCCCC;">*申领日期</td><td class="ys2" colspan="3">{applicationdate}</td></tr><tr><td class="ys1" style="text-align:center;background-color:#CCCCCC;">*资产编号<br /></td><td class="ys2">{assetmnumb}<br /></td><td class="ys1" style="text-align:center;background-color:#CCCCCC;">*资产名称<br /></td><td class="ys2">{assetmname}<br /></td></tr><tr><td class="ys1" style="text-align:center;background-color:#CCCCCC;">*资产价格<br /></td><td class="ys2">{assetmprice}<br /></td><td class="ys1" style="text-align:center;background-color:#CCCCCC;">*资产购买日期<br /></td><td class="ys2">{assetmbuydate}<br /></td></tr><tr><td class="ys1" height="34" align="right" style="text-align:center;height:34px;background-color:#CCCCCC;">*资产详细信息</td><td class="ys2" colspan="3">{assetmdetail}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;">*申领原因</td><td class="ys2" colspan="3"><span style="text-indent:28.2353px;white-space:normal;">{applicationreason}</span><br /></td></tr></tbody></table></p><br />
+<p><br /><table class="" border="1" bordercolor="#000000" style="width:100%;"><tbody><tr><td class="ys1" height="34" align="right" width="15%" style="text-align:center;width:15%;height:34px;background-color:#CCCCCC;">*申领人</td><td class="ys2" width="35%">{user}</td><td class="ys1" align="right" width="15%" style="text-align:center;width:15%;background-color:#CCCCCC;">*申领人部门</td><td class="ys2" width="35%">{dept}</td></tr><tr><td class="ys1" height="34" align="right" style="text-align:center;height:34px;background-color:#CCCCCC;">*申领日期</td><td class="ys2" colspan="3">{date}</td></tr><tr><td class="ys1" style="text-align:center;background-color:#CCCCCC;">*资产编号<br /></td><td class="ys2">{num}<br /></td><td class="ys1" style="text-align:center;background-color:#CCCCCC;">*资产名称<br /></td><td class="ys2">{asset}<br /></td></tr><tr><td class="ys1" style="text-align:center;background-color:#CCCCCC;">*资产价格<br /></td><td class="ys2">{price}<br /></td><td class="ys1" style="text-align:center;background-color:#CCCCCC;">*资产购买日期<br /></td><td class="ys2">{buydate}<br /></td></tr><tr><td class="ys1" height="34" align="right" style="text-align:center;height:34px;background-color:#CCCCCC;">*资产详细信息</td><td class="ys2" colspan="3">{info}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;">*申领原因</td><td class="ys2" colspan="3"><span style="text-indent:28.2353px;white-space:normal;">{cause}</span><br /></td></tr></tbody></table></p><br />
\ No newline at end of file

webmain/flow/page/input_fund_deposit.html

-<hr style="white-space:normal;" /><p style="white-space:normal;"><table style="width:100%;border-collapse:separate;border-spacing:0px 10px;"><tbody><tr><td width="100px">交易流水</td><td width="300px">{trans_numb}</td><td width="100px">*操作人</td><td width="300px">{base_name}</td></tr><tr><td width="100px">*资金来源</td><td width="300px">{account}</td><td width="100px">*转入账户</td><td width="300px">{toaccount}</td></tr><tr><td width="100px">*转入金额</td><td width="300px">{trans_amount}</td><td width="100px">*入账类型</td><td width="300px">{business_type}</td></tr><tr><td width="100px">情况说明</td><td width="300px">{remark}</td></tr></tbody></table></p><hr style="white-space:normal;" />{create_time}
+<hr style="white-space:normal;" /><p style="white-space:normal;"><table style="width:100%;border-collapse:separate;border-spacing:0px 10px;"><tbody><tr><td width="100px">单据编号<br /></td><td width="300px">{trans_numb}</td><td width="100px">*操作人</td><td width="300px">{base_name}</td></tr><tr><td width="100px">*资金来源</td><td width="300px">{account}</td><td width="100px">*转入账户</td><td width="300px">{toaccount}</td></tr><tr><td width="100px">*转入金额</td><td width="300px">{trans_amount}</td><td width="100px">*入账类型</td><td width="300px">{business_type}</td></tr><tr><td width="100px">情况说明</td><td width="300px">{remark}</td></tr></tbody></table></p><hr style="white-space:normal;" />{create_time}
\ No newline at end of file

webmain/flow/page/input_fund_transfer.html

-<hr style="white-space:normal;" /><p style="white-space:normal;"><table style="width:100%;border-collapse:separate;border-spacing:0px 20px;"><tbody><tr><td width="100px">*交易流水</td><td width="300px">{trans_numb}</td><td width="100px">*操作人</td><td width="300px">{base_name}</td></tr><tr><td width="100px">*转出账户</td><td width="300px">{account}{tmp_account}</td><td width="100px">*转入账户</td><td width="300px">{toaccount}</td></tr><tr><td width="100px">*转出金额</td><td width="300px">{trans_amount}</td><td width="100px">*划拨时间</td><td width="300px">{create_time}</td></tr><tr><td width="100px">*划拨类型</td><td width="300px">{business_type}</td><td width="100px">*资金利率</td><td width="300px">{service_fee}</td></tr><tr><td width="100px">*资金规则</td><td width="300px">{fund_rule}</td><td width="100px"></td><td width="300px"></td></tr><tr><td width="100px">情况说明</td><td width="300px">{remark}</td></tr></tbody></table></p><hr style="white-space:normal;" />
+<hr style="white-space:normal;" /><p style="white-space:normal;"><table style="width:100%;border-collapse:separate;border-spacing:0px 20px;"><tbody><tr><td width="100px">*单据编号</td><td width="300px">{trans_numb}</td><td width="100px">*操作人</td><td width="300px">{base_name}</td></tr><tr><td width="100px">*转出账户</td><td width="300px">{account}{tmp_account}</td><td width="100px">*转入账户</td><td width="300px">{toaccount}</td></tr><tr><td width="100px">*转出金额</td><td width="300px">{trans_amount}</td><td width="100px">*划拨时间</td><td width="300px">{create_time}</td></tr><tr><td width="100px">*划拨类型</td><td width="300px">{business_type}</td><td width="100px">*资金利率</td><td width="300px">{service_fee}</td></tr><tr><td width="100px">*资金规则</td><td width="300px">{fund_rule}</td><td width="100px"><br /></td><td width="300px"><br /></td></tr><tr><td width="100px">情况说明</td><td width="300px">{remark}</td></tr></tbody></table></p><hr style="white-space:normal;" />
\ No newline at end of file

webmain/flow/page/rock_page_account_detail.php

@@ -11,7 +11,7 @@ $(document).ready(function(){
 	{params}
 	var modenum = 'account_detail',modename='账户明细',isflow=0,modeid='114',atype = params.atype,pnum=params.pnum,modenames='';
 	if(!atype)atype='';if(!pnum)pnum='';
-	var fieldsarr = [{"name":"\u7533\u8bf7\u4eba","fields":"base_name"},{"name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"trans_numb","name":"\u64cd\u4f5c\u6d41\u6c34\u53f7","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"account","name":"\u8d26\u6237\u540d\u79f0","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"opt_type","name":"\u4f59\u989d\u53d8\u66f4\u7c7b\u578b","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"amount","name":"\u91d1\u989d","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"account_balance","name":"\u8d26\u6237\u4f59\u989d","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u65f6\u95f4","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"}],fieldsselarr= {"columns_account_detail_all":"trans_numb,account,opt_type,amount,account_balance,create_time,caozuo"};
+	var fieldsarr = [{"name":"\u7533\u8bf7\u4eba","fields":"base_name"},{"name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"account","name":"\u8d26\u6237\u540d\u79f0","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"trans_numb","name":"\u5355\u636e\u7f16\u53f7","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"opt_type","name":"\u4f59\u989d\u53d8\u66f4\u7c7b\u578b","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"amount","name":"\u91d1\u989d","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"account_balance","name":"\u8d26\u6237\u4f59\u989d","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u65f6\u95f4","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"remark","name":"\u63cf\u8ff0","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"0"}],fieldsselarr= {"columns_account_detail_all":"trans_numb,account,opt_type,amount,account_balance,create_time,caozuo"};
 	
 	var c = {
 		reload:function(){
@@ -210,7 +210,7 @@ $(document).ready(function(){
 		fanye:true,modenum:modenum,modename:modename,statuschange:false,tablename:jm.base64decode('Y19hY2NvdW50X2RldGFpbA::'),
 		url:c.storeurl(),storeafteraction:'storeaftershow',storebeforeaction:'storebeforeshow',
 		params:{atype:atype},
-		columns:[{text:"操作流水号",dataIndex:"trans_numb",sortable:true},{text:"账户名称",dataIndex:"account",sortable:true},{text:"余额变更类型",dataIndex:"opt_type",sortable:true},{text:"金额",dataIndex:"amount",sortable:true},{text:"账户余额",dataIndex:"account_balance",sortable:true},{text:"时间",dataIndex:"create_time",sortable:true},{
+		columns:[{text:"账户名称",dataIndex:"account",sortable:true},{text:"单据编号",dataIndex:"trans_numb",sortable:true},{text:"余额变更类型",dataIndex:"opt_type",sortable:true},{text:"金额",dataIndex:"amount",sortable:true},{text:"账户余额",dataIndex:"account_balance",sortable:true},{text:"时间",dataIndex:"create_time",sortable:true},{
 			text:'',dataIndex:'caozuo',callback:'opegs{rand}'
 		}],
 		itemdblclick:function(){

webmain/flow/page/rock_page_account_list.php

@@ -11,7 +11,7 @@ $(document).ready(function(){
 	{params}
 	var modenum = 'account_list',modename='资金账户',isflow=0,modeid='113',atype = params.atype,pnum=params.pnum,modenames='';
 	if(!atype)atype='';if(!pnum)pnum='';
-	var fieldsarr = [{"name":"\u7533\u8bf7\u4eba","fields":"base_name"},{"name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"uid","name":"\u6388\u6743\u7528\u6237\u5217\u8868","fieldstype":"changeusercheck","ispx":"0","isalign":"0","islb":"1"},{"fields":"number","name":"\u8d26\u6237\u7f16\u7801","fieldstype":"num","ispx":"1","isalign":"0","islb":"1"},{"fields":"name","name":"\u8d26\u6237\u540d\u79f0","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"cost_id","name":"\u6210\u672c\u4e2d\u5fc3","fieldstype":"selectdatafalse","ispx":"1","isalign":"0","islb":"1"},{"fields":"type","name":"\u8d26\u6237\u7c7b\u578b","fieldstype":"rockcombo","ispx":"1","isalign":"0","islb":"1"},{"fields":"level","name":"\u8d26\u6237\u7ea7\u522b","fieldstype":"rockcombo","ispx":"1","isalign":"0","islb":"1"},{"fields":"status","name":"\u8d26\u6237\u72b6\u6001","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"account_balance","name":"\u8d26\u6237\u4f59\u989d","fieldstype":"number","ispx":"1","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u521b\u5efa\u65f6\u95f4","fieldstype":"datetime","ispx":"1","isalign":"0","islb":"1"},{"fields":"update_time","name":"\u66f4\u65b0\u65f6\u95f4","fieldstype":"datetime","ispx":"0","isalign":"0","islb":"1"},{"fields":"currency_type","name":"\u8d27\u5e01\u7c7b\u578b","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"0"}],fieldsselarr= {"columns_account_list_all":"number,name,cost_id,type,level,status,account_balance,create_time,caozuo"};
+	var fieldsarr = [{"name":"\u7533\u8bf7\u4eba","fields":"base_name"},{"name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"uid","name":"\u6388\u6743\u7528\u6237\u5217\u8868","fieldstype":"changeusercheck","ispx":"0","isalign":"0","islb":"1"},{"fields":"number","name":"\u8d26\u6237\u7f16\u7801","fieldstype":"num","ispx":"1","isalign":"0","islb":"1"},{"fields":"name","name":"\u8d26\u6237\u540d\u79f0","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"cost_id","name":"\u6210\u672c\u4e2d\u5fc3","fieldstype":"selectdatafalse","ispx":"1","isalign":"0","islb":"1"},{"fields":"type","name":"\u8d26\u6237\u7c7b\u578b","fieldstype":"rockcombo","ispx":"1","isalign":"0","islb":"1"},{"fields":"level","name":"\u8d26\u6237\u7ea7\u522b","fieldstype":"rockcombo","ispx":"1","isalign":"0","islb":"1"},{"fields":"status","name":"\u8d26\u6237\u72b6\u6001","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"account_balance","name":"\u8d26\u6237\u4f59\u989d","fieldstype":"number","ispx":"1","isalign":"0","islb":"1"},{"fields":"freeze_amount","name":"\u51bb\u7ed3\u91d1\u989d","fieldstype":"number","ispx":"1","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u521b\u5efa\u65f6\u95f4","fieldstype":"datetime","ispx":"1","isalign":"0","islb":"1"},{"fields":"update_time","name":"\u66f4\u65b0\u65f6\u95f4","fieldstype":"datetime","ispx":"0","isalign":"0","islb":"1"},{"fields":"currency_type","name":"\u8d27\u5e01\u7c7b\u578b","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"0"}],fieldsselarr= {"columns_account_list_all":"number,name,cost_id,type,level,status,account_balance,freeze_amount,create_time,caozuo"};
 	
 	var c = {
 		reload:function(){
@@ -210,7 +210,7 @@ $(document).ready(function(){
 		fanye:true,modenum:modenum,modename:modename,statuschange:false,tablename:jm.base64decode('Y19mdW5kX2FjY291bnQ:'),
 		url:c.storeurl(),storeafteraction:'storeaftershow',storebeforeaction:'storebeforeshow',
 		params:{atype:atype},
-		columns:[{text:"授权用户列表",dataIndex:"uid"},{text:"账户编码",dataIndex:"number",sortable:true},{text:"账户名称",dataIndex:"name",sortable:true},{text:"成本中心",dataIndex:"cost_id",sortable:true},{text:"账户类型",dataIndex:"type",sortable:true},{text:"账户级别",dataIndex:"level",sortable:true},{text:"账户状态",dataIndex:"status",sortable:true},{text:"账户余额",dataIndex:"account_balance",sortable:true},{text:"创建时间",dataIndex:"create_time",sortable:true},{text:"更新时间",dataIndex:"update_time"},{
+		columns:[{text:"授权用户列表",dataIndex:"uid"},{text:"账户编码",dataIndex:"number",sortable:true},{text:"账户名称",dataIndex:"name",sortable:true},{text:"成本中心",dataIndex:"cost_id",sortable:true},{text:"账户类型",dataIndex:"type",sortable:true},{text:"账户级别",dataIndex:"level",sortable:true},{text:"账户状态",dataIndex:"status",sortable:true},{text:"账户余额",dataIndex:"account_balance",sortable:true},{text:"冻结金额",dataIndex:"freeze_amount",sortable:true},{text:"创建时间",dataIndex:"create_time",sortable:true},{text:"更新时间",dataIndex:"update_time"},{
 			text:'',dataIndex:'caozuo',callback:'opegs{rand}'
 		}],
 		itemdblclick:function(){

webmain/flow/page/rock_page_assetm.php

@@ -11,7 +11,7 @@ $(document).ready(function(){
 	{params}
 	var modenum = 'assetm',modename='固定资产',isflow=0,modeid='41',atype = params.atype,pnum=params.pnum,modenames='';
 	if(!atype)atype='';if(!pnum)pnum='';
-	var fieldsarr = [{"name":"\u7533\u8bf7\u4eba","fields":"base_name"},{"name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"title","name":"\u540d\u79f0","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"num","name":"\u8d44\u4ea7\u7f16\u53f7","fieldstype":"num","ispx":"0","isalign":"0","islb":"1"},{"fields":"usename","name":"\u4f7f\u7528\u4eba","fieldstype":"changedeptusercheck","ispx":"0","isalign":"0","islb":"1"},{"fields":"shuname","name":"\u4f7f\u7528\u4eba\u90e8\u95e8","fieldstype":"changedept","ispx":"0","isalign":"0","islb":"1"},{"fields":"state","name":"\u72b6\u6001","fieldstype":"select","ispx":"0","isalign":"0","islb":"1"},{"fields":"price","name":"\u4ef7\u683c","fieldstype":"number","ispx":"0","isalign":"0","islb":"1"},{"fields":"model-os","name":"\u64cd\u4f5c\u7cfb\u7edf","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"typeid","name":"\u8d44\u4ea7\u5206\u7c7b","fieldstype":"select","ispx":"0","isalign":"0","islb":"1"},{"fields":"model-vc","name":"\u663e\u5361","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"model-hdd","name":"\u786c\u76d8","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"model-ram","name":"\u5185\u5b58","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"model-cpu","name":"\u5904\u7406\u5668(CPU)","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"model-bh","name":"\u673a\u5668\u7f16\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"model-xh","name":"\u578b\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"recentuserchangedate","name":"\u6700\u8fd1\u4f7f\u7528\u4eba\u66f4\u8fed\u65e5\u671f","fieldstype":"date","ispx":"0","isalign":"0","islb":"1"},{"fields":"userchangerecord","name":"\u4f7f\u7528\u4eba\u66f4\u8fed\u8bb0\u5f55","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"oanumb","name":"\u8d2d\u4e70\u672c\u8d44\u4ea7\u7684oa\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"fengmian","name":"\u5c01\u9762\u56fe\u7247","fieldstype":"uploadimg","ispx":"0","isalign":"0","islb":"0"},{"fields":"explain","name":"\u8bf4\u660e","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"0"},{"fields":"buydt","name":"\u8d2d\u8fdb\u65e5\u671f","fieldstype":"date","ispx":"0","isalign":"0","islb":"1"},{"fields":"laiyuan","name":"\u8d44\u4ea7\u6765\u6e90","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"1"},{"fields":"model","name":"\u89c4\u683c\u578b\u53f7","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"0"},{"fields":"ckid","name":"\u5b58\u653e\u4ed3\u5e93","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"0"},{"fields":"company","name":"\u6240\u5c5e\u516c\u53f8\u540d\u79f0","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"1"}],fieldsselarr= [];
+	var fieldsarr = [{"name":"\u7533\u8bf7\u4eba","fields":"base_name"},{"name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"title","name":"\u540d\u79f0","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"num","name":"\u8d44\u4ea7\u7f16\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"usename","name":"\u4f7f\u7528\u4eba","fieldstype":"changedeptusercheck","ispx":"0","isalign":"0","islb":"1"},{"fields":"shuname","name":"\u4f7f\u7528\u4eba\u90e8\u95e8","fieldstype":"changedept","ispx":"0","isalign":"0","islb":"1"},{"fields":"state","name":"\u72b6\u6001","fieldstype":"select","ispx":"0","isalign":"0","islb":"1"},{"fields":"price","name":"\u4ef7\u683c","fieldstype":"number","ispx":"0","isalign":"0","islb":"1"},{"fields":"model-os","name":"\u64cd\u4f5c\u7cfb\u7edf","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"typeid","name":"\u8d44\u4ea7\u5206\u7c7b","fieldstype":"select","ispx":"0","isalign":"0","islb":"1"},{"fields":"model-vc","name":"\u663e\u5361","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"model-hdd","name":"\u786c\u76d8","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"model-ram","name":"\u5185\u5b58","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"model-cpu","name":"\u5904\u7406\u5668(CPU)","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"model-bh","name":"\u673a\u5668\u7f16\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"model-xh","name":"\u578b\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"recentuserchangedate","name":"\u6700\u8fd1\u4f7f\u7528\u4eba\u66f4\u8fed\u65e5\u671f","fieldstype":"date","ispx":"0","isalign":"0","islb":"1"},{"fields":"userchangerecord","name":"\u4f7f\u7528\u4eba\u66f4\u8fed\u8bb0\u5f55","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"oanumb","name":"\u8d2d\u4e70\u672c\u8d44\u4ea7\u7684oa\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"fengmian","name":"\u5c01\u9762\u56fe\u7247","fieldstype":"uploadimg","ispx":"0","isalign":"0","islb":"0"},{"fields":"explain","name":"\u8bf4\u660e","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"0"},{"fields":"buydt","name":"\u8d2d\u8fdb\u65e5\u671f","fieldstype":"date","ispx":"0","isalign":"0","islb":"1"},{"fields":"laiyuan","name":"\u8d44\u4ea7\u6765\u6e90","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"1"},{"fields":"model","name":"\u89c4\u683c\u578b\u53f7","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"0"},{"fields":"ckid","name":"\u5b58\u653e\u4ed3\u5e93","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"0"},{"fields":"company","name":"\u6240\u5c5e\u516c\u53f8\u540d\u79f0","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"1"}],fieldsselarr= [];
 	
 	var c = {
 		reload:function(){

webmain/flow/page/rock_page_assetmuse.php

@@ -11,7 +11,7 @@ $(document).ready(function(){
 	{params}
 	var modenum = 'assetmuse',modename='固定资产申领',isflow=1,modeid='120',atype = params.atype,pnum=params.pnum,modenames='';
 	if(!atype)atype='';if(!pnum)pnum='';
-	var fieldsarr = [{"name":"\u7533\u8bf7\u4eba","fields":"base_name"},{"name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"applicant","name":"\u7533\u8bf7\u4eba","fieldstype":"changeuser","ispx":"0","isalign":"0","islb":"1"},{"fields":"applicantdept","name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fieldstype":"changedept","ispx":"0","isalign":"0","islb":"1"},{"fields":"applicationdate","name":"\u7533\u8bf7\u65e5\u671f","fieldstype":"date","ispx":"0","isalign":"0","islb":"1"},{"fields":"assetmname","name":"\u8d44\u4ea7\u540d\u79f0","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"assetmnumb","name":"\u8d44\u4ea7\u7f16\u53f7","fieldstype":"selectdatafalse","ispx":"0","isalign":"0","islb":"0"},{"fields":"applicationreason","name":"\u7533\u8bf7\u539f\u56e0","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"1"},{"fields":"assetmdetail","name":"\u8d44\u4ea7\u8be6\u7ec6\u4fe1\u606f","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"0"},{"fields":"assetmprice","name":"\u8d44\u4ea7\u4ef7\u683c","fieldstype":"number","ispx":"0","isalign":"0","islb":"0"},{"fields":"assetmbuydate","name":"\u8d44\u4ea7\u8d2d\u4e70\u65e5\u671f","fieldstype":"date","ispx":"0","isalign":"0","islb":"0"}],fieldsselarr= [];
+	var fieldsarr = [{"name":"\u7533\u8bf7\u4eba","fields":"base_name"},{"name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"user","name":"\u7533\u8bf7\u4eba","fieldstype":"changeuser","ispx":"0","isalign":"0","islb":"1"},{"fields":"dept","name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fieldstype":"changedept","ispx":"0","isalign":"0","islb":"1"},{"fields":"date","name":"\u7533\u8bf7\u65e5\u671f","fieldstype":"date","ispx":"0","isalign":"0","islb":"1"},{"fields":"asset","name":"\u8d44\u4ea7\u540d\u79f0","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"num","name":"\u8d44\u4ea7\u7f16\u53f7","fieldstype":"selectdatafalse","ispx":"0","isalign":"0","islb":"0"},{"fields":"cause","name":"\u7533\u8bf7\u539f\u56e0","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"1"},{"fields":"info","name":"\u8d44\u4ea7\u8be6\u7ec6\u4fe1\u606f","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"0"},{"fields":"price","name":"\u8d44\u4ea7\u4ef7\u683c","fieldstype":"number","ispx":"0","isalign":"0","islb":"0"},{"fields":"buydate","name":"\u8d44\u4ea7\u8d2d\u4e70\u65e5\u671f","fieldstype":"date","ispx":"0","isalign":"0","islb":"0"}],fieldsselarr= [];
 	
 	var c = {
 		reload:function(){
@@ -210,7 +210,7 @@ $(document).ready(function(){
 		fanye:true,modenum:modenum,modename:modename,statuschange:false,tablename:jm.base64decode('Y19hc3NldG1fdXNl'),
 		url:c.storeurl(),storeafteraction:'storeaftershow',storebeforeaction:'storebeforeshow',
 		params:{atype:atype},
-		columns:[{text:"申请人",dataIndex:"base_name",sortable:true},{text:"申请人部门",dataIndex:"base_deptname",sortable:true},{text:"单号",dataIndex:"sericnum"},{text:"申请人",dataIndex:"applicant"},{text:"申请人部门",dataIndex:"applicantdept"},{text:"申请日期",dataIndex:"applicationdate"},{text:"资产名称",dataIndex:"assetmname"},{text:"申请原因",dataIndex:"applicationreason"},{text:"状态",dataIndex:"statustext"},{
+		columns:[{text:"申请人",dataIndex:"base_name",sortable:true},{text:"申请人部门",dataIndex:"base_deptname",sortable:true},{text:"单号",dataIndex:"sericnum"},{text:"申请人",dataIndex:"user"},{text:"申请人部门",dataIndex:"dept"},{text:"申请日期",dataIndex:"date"},{text:"资产名称",dataIndex:"asset"},{text:"申请原因",dataIndex:"cause"},{text:"状态",dataIndex:"statustext"},{
 			text:'',dataIndex:'caozuo',callback:'opegs{rand}'
 		}],
 		itemdblclick:function(){

webmain/flow/page/rock_page_cost_center.php

@@ -11,7 +11,7 @@ $(document).ready(function(){
 	{params}
 	var modenum = 'cost_center',modename='成本中心',isflow=0,modeid='117',atype = params.atype,pnum=params.pnum,modenames='';
 	if(!atype)atype='';if(!pnum)pnum='';
-	var fieldsarr = [{"name":"\u7533\u8bf7\u4eba","fields":"base_name"},{"name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"code","name":"\u6210\u672c\u4e2d\u5fc3\u7f16\u7801","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"name","name":"\u540d\u79f0","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"principalid","name":"\u8d1f\u8d23\u4eba","fieldstype":"changeuser","ispx":"1","isalign":"0","islb":"1"},{"fields":"type","name":"\u7c7b\u578b","fieldstype":"select","ispx":"1","isalign":"0","islb":"1"},{"fields":"status","name":"\u72b6\u6001","fieldstype":"select","ispx":"1","isalign":"0","islb":"1"},{"fields":"pid","name":"\u4e0a\u7ea7\u6210\u672c\u4e2d\u5fc3","fieldstype":"selectdatafalse","ispx":"1","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u751f\u6548\u65f6\u95f4","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"}],fieldsselarr= {"columns_cost_center_all":"code,name,principalid,type,status,create_time,caozuo"};
+	var fieldsarr = [{"name":"\u7533\u8bf7\u4eba","fields":"base_name"},{"name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"code","name":"\u6210\u672c\u4e2d\u5fc3\u7f16\u7801","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"name","name":"\u540d\u79f0","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"principal","name":"\u8d1f\u8d23\u4eba","fieldstype":"changeuser","ispx":"1","isalign":"0","islb":"1"},{"fields":"type","name":"\u7c7b\u578b","fieldstype":"select","ispx":"1","isalign":"0","islb":"1"},{"fields":"status","name":"\u72b6\u6001","fieldstype":"select","ispx":"1","isalign":"0","islb":"1"},{"fields":"pid","name":"\u4e0a\u7ea7\u6210\u672c\u4e2d\u5fc3","fieldstype":"selectdatafalse","ispx":"1","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u751f\u6548\u65f6\u95f4","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"}],fieldsselarr= {"columns_cost_center_all":"code,name,principal,type,status,create_time,caozuo"};
 	
 	var c = {
 		reload:function(){
@@ -210,7 +210,7 @@ $(document).ready(function(){
 		fanye:true,modenum:modenum,modename:modename,statuschange:false,tablename:jm.base64decode('Y19jYnp4'),
 		url:c.storeurl(),storeafteraction:'storeaftershow',storebeforeaction:'storebeforeshow',
 		params:{atype:atype},
-		columns:[{text:"成本中心编码",dataIndex:"code",sortable:true},{text:"名称",dataIndex:"name",sortable:true},{text:"负责人",dataIndex:"principalid",sortable:true},{text:"类型",dataIndex:"type",sortable:true},{text:"状态",dataIndex:"status",sortable:true},{text:"上级成本中心",dataIndex:"pid",sortable:true},{text:"生效时间",dataIndex:"create_time",sortable:true},{
+		columns:[{text:"成本中心编码",dataIndex:"code",sortable:true},{text:"名称",dataIndex:"name",sortable:true},{text:"负责人",dataIndex:"principal",sortable:true},{text:"类型",dataIndex:"type",sortable:true},{text:"状态",dataIndex:"status",sortable:true},{text:"上级成本中心",dataIndex:"pid",sortable:true},{text:"生效时间",dataIndex:"create_time",sortable:true},{
 			text:'',dataIndex:'caozuo',callback:'opegs{rand}'
 		}],
 		itemdblclick:function(){

webmain/flow/page/rock_page_fund_deposit.php

@@ -11,7 +11,7 @@ $(document).ready(function(){
 	{params}
 	var modenum = 'fund_deposit',modename='资金入账',isflow=0,modeid='115',atype = params.atype,pnum=params.pnum,modenames='';
 	if(!atype)atype='';if(!pnum)pnum='';
-	var fieldsarr = [{"name":"\u7533\u8bf7\u4eba","fields":"base_name"},{"name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"trans_numb","name":"\u4ea4\u6613\u6d41\u6c34","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"toaccount","name":"\u8f6c\u5165\u8d26\u6237","fieldstype":"rockcombo","ispx":"1","isalign":"0","islb":"1"},{"fields":"account","name":"\u8d44\u91d1\u6765\u6e90","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"trans_amount","name":"\u8f6c\u5165\u91d1\u989d","fieldstype":"number","ispx":"1","isalign":"0","islb":"1"},{"fields":"business_type","name":"\u4e1a\u52a1\u7c7b\u578b","fieldstype":"rockcombo","ispx":"1","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u521b\u5efa\u65f6\u95f4","fieldstype":"hidden","ispx":"1","isalign":"0","islb":"1"},{"fields":"remark","name":"\u5907\u6ce8","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"1"}],fieldsselarr= [];
+	var fieldsarr = [{"name":"\u7533\u8bf7\u4eba","fields":"base_name"},{"name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"trans_numb","name":"\u5355\u636e\u7f16\u53f7","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"toaccount","name":"\u8f6c\u5165\u8d26\u6237","fieldstype":"rockcombo","ispx":"1","isalign":"0","islb":"1"},{"fields":"account","name":"\u8d44\u91d1\u6765\u6e90","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"trans_amount","name":"\u8f6c\u5165\u91d1\u989d","fieldstype":"number","ispx":"1","isalign":"0","islb":"1"},{"fields":"business_type","name":"\u4e1a\u52a1\u7c7b\u578b","fieldstype":"rockcombo","ispx":"1","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u521b\u5efa\u65f6\u95f4","fieldstype":"hidden","ispx":"1","isalign":"0","islb":"1"},{"fields":"remark","name":"\u5907\u6ce8","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"1"}],fieldsselarr= [];
 	
 	var c = {
 		reload:function(){
@@ -210,7 +210,7 @@ $(document).ready(function(){
 		fanye:true,modenum:modenum,modename:modename,statuschange:false,tablename:jm.base64decode('Y19mdW5kX2RldGFpbA::'),
 		url:c.storeurl(),storeafteraction:'storeaftershow',storebeforeaction:'storebeforeshow',
 		params:{atype:atype},
-		columns:[{text:"交易流水",dataIndex:"trans_numb",sortable:true},{text:"转入账户",dataIndex:"toaccount",sortable:true},{text:"资金来源",dataIndex:"account",sortable:true},{text:"转入金额",dataIndex:"trans_amount",sortable:true},{text:"业务类型",dataIndex:"business_type",sortable:true},{text:"创建时间",dataIndex:"create_time",sortable:true},{text:"备注",dataIndex:"remark"},{
+		columns:[{text:"单据编号",dataIndex:"trans_numb",sortable:true},{text:"转入账户",dataIndex:"toaccount",sortable:true},{text:"资金来源",dataIndex:"account",sortable:true},{text:"转入金额",dataIndex:"trans_amount",sortable:true},{text:"业务类型",dataIndex:"business_type",sortable:true},{text:"创建时间",dataIndex:"create_time",sortable:true},{text:"备注",dataIndex:"remark"},{
 			text:'',dataIndex:'caozuo',callback:'opegs{rand}'
 		}],
 		itemdblclick:function(){

webmain/flow/page/rock_page_fund_transfer.php

@@ -11,7 +11,7 @@ $(document).ready(function(){
 	{params}
 	var modenum = 'fund_transfer',modename='资金划拨',isflow=1,modeid='116',atype = params.atype,pnum=params.pnum,modenames='';
 	if(!atype)atype='';if(!pnum)pnum='';
-	var fieldsarr = [{"name":"\u7533\u8bf7\u4eba","fields":"base_name"},{"name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"trans_numb","name":"\t\u4ea4\u6613\u6d41\u6c34","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"account","name":"\u8f6c\u51fa\u8d26\u6237","fieldstype":"selectdatafalse","ispx":"1","isalign":"0","islb":"1"},{"fields":"toaccount","name":"\u8f6c\u5165\u8d26\u6237","fieldstype":"selectdatafalse","ispx":"1","isalign":"0","islb":"1"},{"fields":"business_type","name":"\u5212\u62e8\u7c7b\u578b\t","fieldstype":"rockcombo","ispx":"1","isalign":"0","islb":"1"},{"fields":"trans_amount","name":"\u8f6c\u51fa\u91d1\u989d","fieldstype":"number","ispx":"1","isalign":"0","islb":"1"},{"fields":"service_fee","name":"\u8d44\u91d1\u5229\u7387","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"account_balance","name":"\u8d26\u6237\u4f59\u989d","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u521b\u5efa\u65f6\u95f4","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"fund_rule","name":"\u8d44\u91d1\u89c4\u5219","fieldstype":"rockcombo","ispx":"1","isalign":"0","islb":"0"},{"fields":"remark","name":"\u5907\u6ce8","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"1"},{"fields":"tmp_account","name":"\u83b7\u53d6\u8f6c\u51fa\u8d26\u6237id","fieldstype":"hidden","ispx":"0","isalign":"0","islb":"0"}],fieldsselarr= {"columns_fund_transfer_all":"base_name,base_deptname,sericnum,trans_numb,account,toaccount,business_type,trans_amount,service_fee,account_balance,create_time,remark,caozuo"};
+	var fieldsarr = [{"name":"\u7533\u8bf7\u4eba","fields":"base_name"},{"name":"\u7533\u8bf7\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"trans_numb","name":"\u5355\u636e\u7f16\u53f7","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"account","name":"\u8f6c\u51fa\u8d26\u6237","fieldstype":"selectdatafalse","ispx":"1","isalign":"0","islb":"1"},{"fields":"toaccount","name":"\u8f6c\u5165\u8d26\u6237","fieldstype":"selectdatafalse","ispx":"1","isalign":"0","islb":"1"},{"fields":"business_type","name":"\u5212\u62e8\u7c7b\u578b\t","fieldstype":"rockcombo","ispx":"1","isalign":"0","islb":"1"},{"fields":"trans_amount","name":"\u8f6c\u51fa\u91d1\u989d","fieldstype":"number","ispx":"1","isalign":"0","islb":"1"},{"fields":"service_fee","name":"\u8d44\u91d1\u5229\u7387","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"account_balance","name":"\u8f6c\u51fa\u8d26\u6237\u4f59\u989d","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u521b\u5efa\u65f6\u95f4","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"fund_rule","name":"\u8d44\u91d1\u89c4\u5219","fieldstype":"rockcombo","ispx":"1","isalign":"0","islb":"0"},{"fields":"remark","name":"\u5907\u6ce8","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"1"},{"fields":"tmp_account","name":"\u83b7\u53d6\u8f6c\u51fa\u8d26\u6237id","fieldstype":"hidden","ispx":"0","isalign":"0","islb":"0"}],fieldsselarr= {"columns_fund_transfer_all":"trans_numb,account,toaccount,business_type,trans_amount,account_balance,create_time,remark,caozuo"};
 	
 	var c = {
 		reload:function(){
@@ -210,7 +210,7 @@ $(document).ready(function(){
 		fanye:true,modenum:modenum,modename:modename,statuschange:false,tablename:jm.base64decode('Y19mdW5kX2RldGFpbA::'),
 		url:c.storeurl(),storeafteraction:'storeaftershow',storebeforeaction:'storebeforeshow',
 		params:{atype:atype},
-		columns:[{text:"申请人",dataIndex:"base_name",sortable:true},{text:"申请人部门",dataIndex:"base_deptname",sortable:true},{text:"单号",dataIndex:"sericnum"},{text:"	交易流水",dataIndex:"trans_numb",sortable:true},{text:"转出账户",dataIndex:"account",sortable:true},{text:"转入账户",dataIndex:"toaccount",sortable:true},{text:"划拨类型	",dataIndex:"business_type",sortable:true},{text:"转出金额",dataIndex:"trans_amount",sortable:true},{text:"资金利率",dataIndex:"service_fee",sortable:true},{text:"账户余额",dataIndex:"account_balance",sortable:true},{text:"创建时间",dataIndex:"create_time",sortable:true},{text:"备注",dataIndex:"remark"},{text:"状态",dataIndex:"statustext"},{
+		columns:[{text:"申请人",dataIndex:"base_name",sortable:true},{text:"申请人部门",dataIndex:"base_deptname",sortable:true},{text:"单号",dataIndex:"sericnum"},{text:"单据编号",dataIndex:"trans_numb",sortable:true},{text:"转出账户",dataIndex:"account",sortable:true},{text:"转入账户",dataIndex:"toaccount",sortable:true},{text:"划拨类型	",dataIndex:"business_type",sortable:true},{text:"转出金额",dataIndex:"trans_amount",sortable:true},{text:"资金利率",dataIndex:"service_fee",sortable:true},{text:"转出账户余额",dataIndex:"account_balance",sortable:true},{text:"创建时间",dataIndex:"create_time",sortable:true},{text:"备注",dataIndex:"remark"},{text:"状态",dataIndex:"statustext"},{
 			text:'',dataIndex:'caozuo',callback:'opegs{rand}'
 		}],
 		itemdblclick:function(){

webmain/flow/page/rock_page_officia.php

@@ -11,7 +11,7 @@ $(document).ready(function(){
 	{params}
 	var modenum = 'officia',modename='发文单',isflow=1,modeid='19',atype = params.atype,pnum=params.pnum,modenames='';
 	if(!atype)atype='';if(!pnum)pnum='';
-	var fieldsarr = [{"name":"\u62df\u529e\u4eba","fields":"base_name"},{"name":"\u62df\u529e\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"zinum","name":"\u53d1\u6587\u5b57\u53f7","fieldstype":"rockcombo","ispx":"1","isalign":"0","islb":"0"},{"fields":"applydt","name":"\u62df\u7a3f\u65e5\u671f","fieldstype":"date","ispx":"0","isalign":"0","islb":"1"},{"fields":"num","name":"\u516c\u6587\u7f16\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"title","name":"\u6807\u9898","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"titles","name":"\u4e3b\u9898\u8bcd","fieldstype":"text","ispx":"0","isalign":"0","islb":"0"},{"fields":"unitsame","name":"\u53d1\u6587\u5355\u4f4d","fieldstype":"text","ispx":"0","isalign":"0","islb":"0"},{"fields":"grade","name":"\u516c\u6587\u7b49\u7ea7","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"0"},{"fields":"class","name":"\u516c\u6587\u7c7b\u578b","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"0"},{"fields":"unitname","name":"\u4e3b\u9001\u5355\u4f4d","fieldstype":"selectdatatrue","ispx":"0","isalign":"0","islb":"1"},{"fields":"miji","name":"\u516c\u6587\u5bc6\u7ea7","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"1"},{"fields":"chaoname","name":"\u6284\u9001\u5355\u4f4d","fieldstype":"selectdatatrue","ispx":"0","isalign":"0","islb":"0"},{"fields":"filecontid","name":"\u6b63\u6587\u6587\u4ef6","fieldstype":"uploadfile","ispx":"0","isalign":"0","islb":"0"},{"fields":"zuncheng","name":"\u6b63\u6587\u4e0a\u79f0\u547c","fieldstype":"text","ispx":"0","isalign":"0","islb":"0"},{"fields":"content","name":"\u516c\u6587\u5185\u5bb9","fieldstype":"htmlediter","ispx":"0","isalign":"0","islb":"0"},{"fields":"explain","name":"\u62df\u529e\u610f\u89c1","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"0"},{"fields":"thid","name":"\u662f\u5426\u5957\u7ea2","fieldstype":"select","ispx":"1","isalign":"0","islb":"1"},{"fields":"yzid","name":"\u76d6\u7ae0","fieldstype":"number","ispx":"1","isalign":"0","islb":"1"},{"fields":"recename","name":"\u9700\u8981\u67e5\u9605","fieldstype":"changedeptusercheck","ispx":"0","isalign":"0","islb":"1"}],fieldsselarr= [];
+	var fieldsarr = [{"name":"\u62df\u529e\u4eba","fields":"base_name"},{"name":"\u62df\u529e\u4eba\u90e8\u95e8","fields":"base_deptname"},{"name":"\u5355\u53f7","fields":"sericnum"},{"fields":"zinum","name":"\u53d1\u6587\u5b57\u53f7","fieldstype":"rockcombo","ispx":"1","isalign":"0","islb":"0"},{"fields":"applydt","name":"\u62df\u7a3f\u65e5\u671f","fieldstype":"date","ispx":"0","isalign":"0","islb":"1"},{"fields":"num","name":"\u516c\u6587\u7f16\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"title","name":"\u6807\u9898","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"titles","name":"\u4e3b\u9898\u8bcd","fieldstype":"text","ispx":"0","isalign":"0","islb":"0"},{"fields":"unitsame","name":"\u53d1\u6587\u5355\u4f4d","fieldstype":"text","ispx":"0","isalign":"0","islb":"0"},{"fields":"grade","name":"\u516c\u6587\u7b49\u7ea7","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"0"},{"fields":"class","name":"\u516c\u6587\u7c7b\u578b","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"0"},{"fields":"unitname","name":"\u4e3b\u9001\u5355\u4f4d","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"1"},{"fields":"miji","name":"\u516c\u6587\u5bc6\u7ea7","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"1"},{"fields":"chaoname","name":"\u6284\u9001\u5355\u4f4d","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"0"},{"fields":"filecontid","name":"\u6b63\u6587\u6587\u4ef6","fieldstype":"uploadfile","ispx":"0","isalign":"0","islb":"0"},{"fields":"zuncheng","name":"\u6b63\u6587\u4e0a\u79f0\u547c","fieldstype":"text","ispx":"0","isalign":"0","islb":"0"},{"fields":"content","name":"\u516c\u6587\u5185\u5bb9","fieldstype":"htmlediter","ispx":"0","isalign":"0","islb":"0"},{"fields":"explain","name":"\u62df\u529e\u610f\u89c1","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"0"},{"fields":"thid","name":"\u662f\u5426\u5957\u7ea2","fieldstype":"select","ispx":"1","isalign":"0","islb":"1"},{"fields":"yzid","name":"\u76d6\u7ae0","fieldstype":"number","ispx":"1","isalign":"0","islb":"1"},{"fields":"recename","name":"\u9700\u8981\u67e5\u9605","fieldstype":"changedeptusercheck","ispx":"0","isalign":"0","islb":"1"}],fieldsselarr= [];
 	
 	var c = {
 		reload:function(){

webmain/flow/page/view_account_detail_0.html

-<hr style="white-space:normal;" /><p style="white-space:normal;"><table style="width:100%;border-collapse:separate;border-spacing:0px 10px;"><tbody><tr><td width="100px">操作流水号</td><td width="300px">{trans_numb}</td><td width="100px">账户名称</td><td width="300px">{account}</td></tr><tr><td width="100px">余额变更类型</td><td width="300px">{opt_type}<br /></td><td width="100px">金额</td><td width="300px">{amount}</td></tr><tr><td width="100px">账户余额</td><td width="300px">{account_balance}</td><td width="100px">时间<br /></td><td width="300px">{create_time}<br /></td></tr></tbody></table></p><hr style="white-space:normal;" /><br />
+<hr style="white-space:normal;" /><p style="white-space:normal;"><table style="width:100%;border-collapse:separate;border-spacing:0px 10px;"><tbody><tr><td width="100px">单据编号</td><td width="300px">{trans_numb}</td><td width="100px">账户名称</td><td width="300px">{account}</td></tr><tr><td width="100px">余额变更类型</td><td width="300px">{opt_type}<br /></td><td width="100px">金额</td><td width="300px">{amount}</td></tr><tr><td width="100px">账户余额</td><td width="300px">{account_balance}</td><td width="100px">时间<br /></td><td width="300px">{create_time}<br /></td></tr><tr><td width="100px">描述</td><td width="300px">{remark}</td></tr></tbody></table></p><hr style="white-space:normal;" /><br /><audio controls="controls" style="display:none;"></audio>
\ No newline at end of file

webmain/flow/page/view_account_list_0.html

-<hr style="white-space:normal;" /><p style="white-space:normal;"><table style="width:100%;border-collapse:separate;border-spacing:0px 10px;"><tbody><tr><td style="padding:10px;width:100px;">单号</td><td width="300px">{base_sericnum}</td><td style="padding:10px;" width="100px">创建时间</td><td width="300px">{create_time}</td></tr><tr><td style="padding:10px;width:100px;">账户名称</td><td width="300px">{name}</td><td style="padding:10px;width:100px;">账户编码</td><td width="300px">{number}</td></tr><tr><td style="padding:10px;width:100px;">账户余额</td><td width="300px">{account_balance}</td><td style="padding:10px;width:100px;">货币类型</td><td width="300px">{currency_type}</td></tr><tr><td style="padding:10px;width:100px;">账户级别</td><td width="300px">{level}</td><td style="padding:10px;width:100px;">账户类型</td><td width="300px">{type}</td></tr><tr><td style="padding:10px;width:100px;">成本中心</td><td width="300px">{cost_id}</td><td style="padding:10px;width:100px;">授权用户</td><td width="300px">{uid}</td></tr></tbody></table></p><hr style="white-space:normal;" />
+<hr style="white-space:normal;" /><p style="white-space:normal;"><table style="width:100%;border-collapse:separate;border-spacing:0px 10px;"><tbody><tr><td style="padding:10px;width:100px;">账户编码</td><td width="300px">{number}</td><td style="padding:10px;width:100px;">账户名称</td><td width="300px">{name}</td></tr><tr><td style="padding:10px;width:100px;">账户余额</td><td width="300px">{account_balance}</td><td style="padding:10px;width:100px;">冻结金额</td><td width="300px">{freeze_amount}</td></tr><tr><td style="padding:10px;width:100px;">账户级别</td><td width="300px">{level}</td><td style="padding:10px;width:100px;">账户类型</td><td width="300px">{type}</td></tr><tr><td style="padding:10px;width:100px;">成本中心</td><td width="300px">{cost_id}</td><td style="padding:10px;width:100px;">货币类型</td><td width="300px">{currency_type}</td></tr><tr><td style="padding:10px;width:100px;">授权用户</td><td width="300px">{uid}</td><td style="padding:10px;" width="100px">创建时间</td><td width="300px">{create_time}</td></tr></tbody></table></p><hr style="white-space:normal;" />
\ No newline at end of file

webmain/flow/page/view_assetmnew_0.html

+<p><span style="font-size:small;"><br /></span> <table width="100%" class="ke-zeroborder" bordercolor="#000000" border="0"><tbody><tr><td height="34" align="right" class="ys1">资产编号</td><td class="ys2">{num}</td><td align="right" class="ys1"><span style="text-indent:28px;font-size:small;white-space:normal;">状态</span><br /></td><td class="ys2"><span style="text-indent:28px;font-size:small;white-space:normal;">{state}</span><br /></td></tr><tr><td height="34" align="right" class="ys1">资产分类</td><td class="ys2">{typeid}</td><td class="ys2" style="text-align:right;">资产来源</td><td class="ys2"><span style="text-indent:28px;white-space:normal;">{source}</span><br /></td></tr><tr><td height="34" align="right" class="ys1"><span style="white-space:normal;">使用人</span><br /></td><td class="ys2"><span style="white-space:normal;">{usename}</span> </td><td align="right" class="ys1"><span style="white-space:normal;">使用人部门</span><br /></td><td class="ys2"><span style="white-space:normal;">{deptname}</span> </td></tr><tr><td width="15%" height="34" align="right" class="ys1">资产名称<br /></td><td width="35%" class="ys2">{title}</td><td width="15%" align="right" class="ys1">价格<br /></td><td width="35%" class="ys2"><span style="white-space:normal;">{price}</span><br /></td></tr><tr><td height="34" align="right" class="ys1">所属公司名称<br /></td><td class="ys2">{company}</td><td align="right" class="ys1">oa号<br /></td><td class="ys2">{oanum}</td></tr><tr><td height="34" align="right" class="ys1">使用人更迭记录</td><td class="ys2">{log}</td><td align="right" class="ys1">最近使用人更迭日期</td><td class="ys2">{changedt}</td></tr><tr><td class="ys1" style="text-align:right;">购进日期<br /></td><td class="ys2" colspan="3"><span style="text-indent:28px;white-space:normal;">{buydt}</span><br /></td></tr><tr><td class="ys2" style="background-color:#CCCCCC;" colspan="4"><p><strong>详细信息</strong> </p></td></tr><tr><td height="34" align="right" class="ys1"><span style="white-space:normal;">型号</span> </td><td class="ys2" colspan="3"><span style="white-space:normal;">{model_type}</span> </td></tr><tr><td class="ys1" style="text-align:right;">机器编号<br /></td><td class="ys1">{model_id}<br /></td><td class="ys1" style="text-align:right;"><span style="text-indent:2em;">处理器(CPU)</span><span style="text-indent:2em;"></span> </td><td class="ys1">{model_cpu}<br /></td></tr><tr><td class="ys1" style="text-align:right;">内存<br /></td><td class="ys1">{model_ram}<br /></td><td class="ys1" style="text-align:right;">硬盘<br /></td><td class="ys1">{model_hdd}<br /></td></tr><tr><td class="ys1" style="text-align:right;">显卡<br /></td><td class="ys1">{model_vc}</td><td class="ys1" style="text-align:right;">操作系统<br /></td><td class="ys1">{model_os}<br /></td></tr></tbody></table></p><audio controls="controls" style="display:none;"></audio>
\ No newline at end of file

webmain/flow/page/view_assetmuse_0.html

-<p><br /><table class="" border="1" bordercolor="#000000" style="width:100%;"><tbody><tr><td class="ys1" height="34" align="right" width="15%" style="text-align:center;width:15%;height:34px;background-color:#CCCCCC;">申领人</td><td class="ys2" width="35%">{applicant}</td><td class="ys1" align="right" width="15%" style="text-align:center;width:15%;background-color:#CCCCCC;">申领人部门</td><td class="ys2" width="35%">{applicantdept}</td></tr><tr><td class="ys1" height="34" align="right" style="text-align:center;height:34px;background-color:#CCCCCC;">申领日期</td><td class="ys2" colspan="3">{applicationdate}</td></tr><tr><td class="ys1" style="text-align:center;background-color:#CCCCCC;">资产编号<br /></td><td class="ys2">{assetmnumb}<br /></td><td class="ys1" style="text-align:center;background-color:#CCCCCC;">资产名称<br /></td><td class="ys2">{assetmname}<br /></td></tr><tr><td class="ys1" style="text-align:center;background-color:#CCCCCC;">资产价格<br /></td><td class="ys2">{assetmprice}<br /></td><td class="ys1" style="text-align:center;background-color:#CCCCCC;">资产购买日期<br /></td><td class="ys2">{assetmbuydate}<br /></td></tr><tr><td class="ys1" height="34" align="right" style="text-align:center;height:34px;background-color:#CCCCCC;">资产详细信息</td><td class="ys2" colspan="3">{assetmdetail}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;">申领原因</td><td class="ys2" colspan="3"><span style="text-indent:28.2353px;white-space:normal;">{applicationreason}</span><br /></td></tr></tbody></table></p><br />
+<p><br /><table class="" border="1" bordercolor="#000000" style="width:100%;"><tbody><tr><td class="ys1" height="34" align="right" width="15%" style="text-align:center;width:15%;height:34px;background-color:#CCCCCC;">申领人</td><td class="ys2" width="35%">{user}</td><td class="ys1" align="right" width="15%" style="text-align:center;width:15%;background-color:#CCCCCC;">申领人部门</td><td class="ys2" width="35%">{dept}</td></tr><tr><td class="ys1" height="34" align="right" style="text-align:center;height:34px;background-color:#CCCCCC;">申领日期</td><td class="ys2" colspan="3">{date}</td></tr><tr><td class="ys1" style="text-align:center;background-color:#CCCCCC;">资产编号<br /></td><td class="ys2">{num}<br /></td><td class="ys1" style="text-align:center;background-color:#CCCCCC;">资产名称<br /></td><td class="ys2">{asset}<br /></td></tr><tr><td class="ys1" style="text-align:center;background-color:#CCCCCC;">资产价格<br /></td><td class="ys2">{price}<br /></td><td class="ys1" style="text-align:center;background-color:#CCCCCC;">资产购买日期<br /></td><td class="ys2">{buydate}<br /></td></tr><tr><td class="ys1" height="34" align="right" style="text-align:center;height:34px;background-color:#CCCCCC;">资产详细信息</td><td class="ys2" colspan="3">{info}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;">申领原因</td><td class="ys2" colspan="3"><span style="text-indent:28.2353px;white-space:normal;">{cause}</span><br /></td></tr></tbody></table></p><br />
\ No newline at end of file

webmain/flow/page/view_cost_center_0.html

-<hr style="white-space:normal;" /><p style="white-space:normal;"><table style="width:100%;border-collapse:separate;border-spacing:0px 10px;"><tbody><tr><td width="100px">单号</td><td width="300px">{base_sericnum}</td><td width="100px">创建时间</td><td width="300px">{create_time}</td></tr><tr><td width="100px">编码</td><td width="300px">{code}</td><td width="100px">名称</td><td width="300px">{name}</td></tr><tr><td width="100px">负责人</td><td width="300px">{principalid}</td><td width="100px">类型</td><td width="300px">{type}</td></tr><tr><td width="100px">上级成本中心</td><td width="300px">{pid}</td><td width="100px">状态</td><td width="300px">{status}</td></tr></tbody></table></p><hr style="white-space:normal;" />
+<hr style="white-space:normal;" /><p style="white-space:normal;"><table style="width:100%;border-collapse:separate;border-spacing:0px 10px;"><tbody><tr><td width="100px">编码</td><td width="300px">{code}</td><td width="100px">名称</td><td width="300px">{name}</td></tr><tr><td width="100px">负责人</td><td width="300px">{principal}</td><td width="100px">类型</td><td width="300px">{type}</td></tr><tr><td width="100px">上级成本中心</td><td width="300px">{pid}</td><td width="100px">状态</td><td width="300px">{status}</td></tr><tr><td width="100px"><span style="text-indent:28px;white-space:normal;">创建时间</span><br /></td><td width="300px"><span style="text-indent:28px;white-space:normal;">{create_time}</span></td><td width="100px"><br /></td><td width="300px"><br /></td></tr></tbody></table></p><hr style="white-space:normal;" />
\ No newline at end of file

webmain/flow/page/view_fund_deposit_0.html

-<hr style="white-space:normal;" /><p style="white-space:normal;"><table style="width:100%;border-collapse:separate;border-spacing:0px 10px;"><tbody><tr><td width="100px">交易流水</td><td width="300px">{trans_numb}</td><td width="100px">*操作人</td><td width="300px">{base_name}</td></tr><tr><td width="100px">*资金来源</td><td width="300px">{account}</td><td width="100px">*转入账户</td><td width="300px">{toaccount}</td></tr><tr><td width="100px">*转入金额</td><td width="300px">{trans_amount}</td><td width="100px">*入账类型</td><td width="300px">{business_type}</td></tr><tr><td width="100px">情况说明</td><td width="300px">{remark}</td></tr></tbody></table></p><hr style="white-space:normal;" />{create_time}
+<hr style="white-space:normal;" /><p style="white-space:normal;"><table style="width:100%;border-collapse:separate;border-spacing:0px 10px;"><tbody><tr><td width="100px">单据编号</td><td width="300px">{trans_numb}</td><td width="100px">*操作人</td><td width="300px">{base_name}</td></tr><tr><td width="100px">*资金来源</td><td width="300px">{account}</td><td width="100px">*转入账户</td><td width="300px">{toaccount}</td></tr><tr><td width="100px">*转入金额</td><td width="300px">{trans_amount}</td><td width="100px">*入账类型</td><td width="300px">{business_type}</td></tr><tr><td width="100px">情况说明</td><td width="300px">{remark}</td><td width="100px">创建时间</td><td width="300px">{create_time}</td></tr></tbody></table></p><hr style="white-space:normal;" /><br />
\ No newline at end of file

webmain/flow/page/view_fund_transfer_0.html

-<hr style="white-space:normal;" /><p style="white-space:normal;"><table style="width:100%;border-collapse:separate;border-spacing:0px 10px;"><tbody><tr><td width="100px">交易流水</td><td width="300px">{trans_numb}</td><td width="100px">操作人</td><td width="300px">{base_name}</td></tr><tr><td width="100px">转出账户</td><td width="300px">{account}</td><td width="100px">转入账户</td><td width="300px">{toaccount}</td></tr><tr><td width="100px">转出金额</td><td width="300px">{trans_amount}</td><td width="100px">划拨时间</td><td width="300px">{create_time}</td></tr><tr><td width="100px">划拨类型</td><td width="300px">{business_type}</td><td width="100px">资金利率</td><td width="300px">{service_fee}</td></tr><tr><td width="100px">资金规则</td><td width="300px">{fund_rule}</td><td width="100px"></td><td width="300px"></td></tr><tr><td width="100px">情况说明</td><td width="300px">{remark}</td></tr></tbody></table></p><hr style="white-space:normal;" />
+<hr style="white-space:normal;" /><p style="white-space:normal;"><table style="width:100%;border-collapse:separate;border-spacing:0px 10px;"><tbody><tr><td width="100px">单据编号<br /></td><td width="300px">{trans_numb}</td><td width="100px">操作人</td><td width="300px">{base_name}</td></tr><tr><td width="100px">转出账户</td><td width="300px">{account}</td><td width="100px">转入账户</td><td width="300px">{toaccount}</td></tr><tr><td width="100px">转出金额</td><td width="300px">{trans_amount}</td><td width="100px">账户余额</td><td width="300px">{account_balance}</td></tr><tr><td width="100px">划拨类型</td><td width="300px">{business_type}</td><td width="100px">资金利率</td><td width="300px">{service_fee}</td></tr><tr><td width="100px">资金规则</td><td width="300px">{fund_rule}</td><td width="100px">划拨时间</td><td width="300px">{create_time}</td></tr><tr><td width="100px">情况说明</td><td width="300px">{remark}</td></tr></tbody></table></p><hr style="white-space:normal;" />
\ No newline at end of file

webmain/model/flow/account_detailModel.php

@@ -5,10 +5,13 @@ class flow_account_detailClassModel extends flowModel
 	
   public function flowrsreplace($rs)
     {
-
-    
+          $uid=$this->adminid;
+          $sql="account in ( select a.name from oa_c_fund_account as a where uid like concat({$uid},',%') or uid like concat('%,',{$uid}) or uid like concat('%,',{$uid},',%') )";
+          $account_detail = m('c_account_detail')->getall($sql,'account');
+          foreach ($account_detail as $key => $value){
+              $allaccount[]=$value['account'];
+          }
          foreach ($rs as $k => &$v) {
-   	 
             switch ($k) {
                 case 'opt_type':
                     if($v == 1) {
@@ -19,17 +22,60 @@ class flow_account_detailClassModel extends flowModel
                     } else {
                         $v = '';
                     }
-                    continue;
                     break;
-
-
-            }
-           
+                case 'trans_numb':
+                   
+                    $arr=$this->getnums($v);
+                    if($arr){
+                      $num=$arr['num'];
+                      $id=$arr['id'];
+                      $name=$arr['name'];
+                      $v= "<a href='javascript:;' onclick=openxiangs('$name','$num',$id)>$v</a>";
+                    }else{
+                      $v=$v;
+                    }
+                    break;
+                 case 'account':
+                    if(!in_array($v,$allaccount)){
+                        $rs['account_balance']='***';
+                    }else{
+                        $rs['account_balance']=$rs['account_balance'];
+                    }
+                   break;
+               }  
         }
         return $rs;
     }
 
-	
-	 
+	 public function getnums($num){
+
+        if(strpos($num, 'OA-FK') !==false){
+              $ids = m('c_fininfom_oafk')->getone('docnum = "'.$num.'"','id');
+              $ids['num']='oafk';
+              $ids['name']='付款申请单';
+              // $ids['id']=$ids['id'];
+        }
+        if(strpos($num, 'OA-YFK') !==false){
+              $ids = m('c_fininfom_oayfk')->getone('docnum = "'.$num.'"','id');
+              $ids['num']='oayfk';
+              $ids['name']='预付款申请单';
+        }
+        if(strpos($num, 'OA-BX') !==false){
+              $ids = m('fininfom')->getone('docnum = "'.$num.'"','id'); 
+              $ids['num']='finfybx';
+              $ids['name']='费用报销';
+        }
+        if(strpos($num, 'FT') !==false){
+              $ids = m('c_fund_detail')->getone('trans_numb = "'.$num.'"','id'); 
+              $ids['num']='fund_transfer';
+              $ids['name']='资金划拨';
+        }
+        if(strpos($num, 'FS') !==false){
+              $ids = m('c_fund_detail')->getone('trans_numb = "'.$num.'"','id'); 
+              $ids['num']='fund_deposit';
+              $ids['name']='资金入账';
+        }
+        return $ids;
+    }
 }
 

webmain/model/flow/account_detailModel.php.bak

+<?php
+class flow_account_detailClassModel extends flowModel
+{
+	
+	
+  public function flowrsreplace($rs)
+    {
+
+    
+         foreach ($rs as $k => &$v) {
+   	 
+            switch ($k) {
+                case 'opt_type':
+                    if($v == 1) {
+                        $v = '收入';
+                      
+                    } else if($v == 2) {
+                        $v = '支出';
+                    } else {
+                        $v = '';
+                    }
+                    continue;
+                    break;
+
+
+            }
+           
+        }
+        return $rs;
+    }
+
+	
+	 
+}
+

webmain/model/flow/account_listModel.php

@@ -6,18 +6,29 @@ class flow_account_listClassModel extends flowModel
 
  public function flowrsreplace($rs)
     {
+
+         if($rs['uid']){
+                $uid=explode(',',$rs['uid']);
+                $admin = m('admin')->getall('status = 1 ','id,name');
+                foreach ($admin as $key => $vo) {
+                    if(in_array($vo['id'],$uid)){
+                         $name[]=$vo['name'];
+                    }
+                }
+                 $rs['uid']= implode(",",$name);
+            }
 		    if($rs['type']){
-                $data=$this->db->getone('oa_option',"num='".$rs['status']."' and pid=1366");
+                $data=$this->db->getone('oa_option',"num='".$rs['type']."' and pid=1366");
                 $rs['type']=$data['name'];
             }
              if($rs['level']){
                 $data=$this->db->getone('oa_option',"num='".$rs['level']."' and pid=1370");
                 $rs['level']=$data['name'];
             }
-            if($rs['status']){
+            
                 $data=$this->db->getone('oa_option',"num='".$rs['status']."' and pid=1374");
                 $rs['status']=$data['name'];
-            }
+            
 
              if($rs['currency_type']){
                 $data=$this->db->getone('oa_option',"num='".$rs['currency_type']."'");

webmain/model/flow/assetmnewModel.php

+<?php
+class flow_assetmnewClassModel extends flowModel
+{
+
+
+  public function initModel()
+  {
+    $this->statearr = c('array')->strtoarray('blue|闲置,#ff6600|在用,red|维修,gray|报废,gray|丢失');
+  }
+
+  public function flowrsreplace($rs)
+
+  {
+
+    if (isset($rs['typeid'])) $rs['typeid']   = $this->db->getmou('[Q]option', 'name', "`id`='" . $rs['typeid'] . "'");
+
+    if (isset($this->statearr[$rs['state']])) {
+      $b        = $this->statearr[$rs['state']];
+      $rs['state'] = '<font color="' . $b[0] . '">' . $b[1] . '</font>';
+    }
+
+    return $rs;
+  }
+}

webmain/model/flow/cost_centerModel.php

@@ -10,11 +10,17 @@ class flow_cost_centerClassModel extends flowModel
                 $data=$this->db->getone('oa_option',"num='".$rs['type']."' and pid=1377");
                 $rs['type']=$data['name'];
             }
-             if($rs['status']){
+             
                 $data=$this->db->getone('oa_option',"num='".$rs['status']."' and pid=1380");
                 $rs['status']=$data['name'];
-            }
+            
            
+             if($rs['pid']){
+                $data=$this->db->getone('oa_c_cbzx',"id='".$rs['pid']."'");
+                $rs['pid']=$data['name'];
+             }
+
+
 
 		            return $rs;
 	}

webmain/model/flow/customer_listModel.php

@@ -176,7 +176,7 @@ class flow_customer_listClassModel extends flowModel
 			$cloudUrl = "http://192.168.1.211/k3cloud/";
 			//登陆参数
 			$data = array(
-			'5d64e2f4ecb139',//帐套Id
+			'5e64f6ff0bd47f',//帐套Id
 			'Administrator',//用户名
 			'666666',//密码
 			'2052'//语言标识359010087

webmain/model/flow/emfkModel.php

+<?php
+
+class flow_emfkClassModel extends flowModel
+{
+    const PAYMENT_STATUS = [
+        0 => '待审核',
+        1 => '未提交',
+        2 => '审核中',
+        3 => '已付款',
+        4 => '已付款 缺发票',
+        5 => '已付款 发票已上传',
+        7 => '被驳回',
+        8 => '已确收',
+        9 => '审核失败',
+    ];
+
+
+
+    /**
+     * 审核时触发
+     * @param $zt 1同意 2拒绝
+     * @param $sm
+     */
+    protected function flowcheckafter($zt, $sm){
+        if($zt == 2){
+           $this->updatestatus(5);
+            $this->sendMess(0,9);
+        }
+    }
+    /**
+     * @param int $messType 动作
+     * @param int $status 状态
+     */
+    private function sendMess($messType = 0,$status = 3){
+        m('log')->addlog('电费付款','接口动作:'.$messType.'状态:'.$status);
+
+        $url = getconfig('base_url'). 'v2/payment?key=';
+        $key = substr(md5(getconfig('openkey').date('Y-m-d')),0,12);
+        $url = $url.$key.'&action='.$messType; //接口地址
+        $url .= '&numb='.$this->rs['docnum'];
+        $url .= '&status='.$status;
+        $url .= '&mes='.'';
+        m('log')->addlog('电费付款','接口返回信息: url '.$url);
+
+        $res = curlGet($url);
+        m('log')->addlog('电费付款','接口返回信息:' .$res);
+
+    }
+  public static function dept($data)
+    {
+        $sql="  id= '$data'";
+        $cbzxid = m('tmp_department')->getone($sql, 'id,cost');//查询账户表成本中心id
+        return $cbzxid['cost'];
+    }
+
+
+   public static function project($project_code){
+
+        $url = getconfig('base_url'). 'v2/project/list?key=';
+        $key = substr(md5(getconfig('openkey').date('Y-m-d')),0,12);
+        $url = $url.$key;
+        $url .= '&project_code='.$project_code;
+        $res = json_decode(curlGet($url),true);
+        return $res;
+    }
+
+    //二级 或一级审批同意之后进行预扣款
+    protected function flowcheckbefore($zt, $sm){
+        $id=$this->rs['id'];
+        $sql = " mid ='$id' and `table`='c_emfk' ";
+        $flow_bill = m('flow_bill')->getone($sql,'allcheckid');
+        $allcheckid=explode(',',$flow_bill['allcheckid']);
+        $optionid = m('option')->getone("num = 'em_manager' ",'id');
+        $optionid=$optionid['id'];
+        $option = m('option')->getall("num = '$optionid' and num =1 order by sort desc",'num,name,value,sort');
+        foreach ($option as $key => $value) {
+            if(in_array($value['value'], $allcheckid)){
+                $checkid= $value['value'];
+                break;
+            }
+        }
+
+        if(empty($checkid)){
+            $option = m('option')->getall("pid ='$optionid'  and num =2 order by sort desc",'num,name,value,sort,`explain`');
+            foreach ($option as $key => $value) {
+                if(in_array($value['value'], $allcheckid)){
+                    $checkid= $value['value'];
+                    break;
+                }
+            }
+        }
+
+
+        //zt 1代表同意
+        if($zt==1){
+            $flowid=$this->getflow();
+
+                if($flowid['nowcheckid']==$checkid){
+                    $data = m('c_emfk_details')->getall('mid='.$this->rs['id'], 'id,cbzxid,amount');
+
+                    foreach ($data as $key => $vo) {
+
+                        $project=self::project($vo['cbzxid']);
+
+
+                        $cbzx_code= self::dept($project['data'][0]['jz_cur_dept']);
+
+                        $sql = " cost_id='$cbzx_code' and status = 1 and  is_default=1";
+                        $cost = m('c_fund_account')->getone($sql, 'id,type,freeze_amount,account_balance');//查询账户表成本中心id
+                        if($cost['type']=='1'){
+                            if(($cost['account_balance']-$cost['freeze_amount'])<$vo['amount']){
+                                return "账户余额不足";die;
+                            }
+                        }
+                        $id=$cost['id'];
+
+                        $c_withhold = array(
+                            'fund_account_id' => $id,
+                            'docnum' => $this->rs['docnum'],
+                            'cost_id' => $vo['cbzxid'],
+                            'amount' =>  $vo['amount'],
+                            'status' => 1,
+                            'create_time' => date("Y-m-d H:i:s"),
+                            'uid' => $this->rs['uid'],
+                        );
+                        m('c_withhold_emfk')->insert($c_withhold);
+
+                        //修改冻结余额
+                        $freeze = array(
+                            'freeze_amount' => $cost['freeze_amount'] + $vo['amount'],
+                        );
+
+                        m('c_fund_account')->update($freeze, "`id`='$id'");
+                    }
+                }
+
+        }else{
+            $docnum=$this->rs['docnum'];
+            //将单据状态作废余额
+            $withhold_cost = m('c_withhold_emfk')->getall("docnum='$docnum' and status =1", 'id,cost_id,amount');
+
+            foreach ($withhold_cost as $key => $vo) {
+                //减去冻结金额
+                $project=self::project($vo['cost_id']);
+
+                $cost_id= self::dept($project['data'][0]['jz_cur_dept']);
+
+                $sql = " cost_id='$cost_id' and status = 1 and  is_default=1";
+                $fund_account_cost = m('c_fund_account')->getone($sql, 'id,freeze_amount');
+
+                $id=$fund_account_cost['id'];
+                $freeze = array(
+                    'freeze_amount' => $fund_account_cost['freeze_amount'] - $vo['amount'],
+                );
+
+
+                m('c_fund_account')->update($freeze, "`id`='$id'");
+
+            }
+            $status = array(
+                'status' => 9,
+            );
+            m('c_withhold_emfk')->update($status, "docnum='$docnum'");
+        }
+    }
+
+
+ //流程全部完成后调用
+        protected function flowcheckfinsh($zt){
+            $this->sendMess(1,3);
+            $docnum=$this->rs['docnum'];
+            $withhold_cost = m('c_withhold_emfk')->getall("docnum='$docnum' and status =1", 'id,cost_id,amount');
+
+            foreach ($withhold_cost as $key => $vo) {
+                // 扣除账户余额 c_fund_account account_balance
+                $project=self::project($vo['cost_id']);
+                $cbzxid= self::dept($project['data'][0]['jz_cur_dept']);
+
+                $model = 'c_fund_account';
+                $sql = " cost_id ='$cbzxid' and status = 1 and  is_default=1";
+                $data = m($model)->getone($sql,'id,name,account_balance,freeze_amount');
+
+                $zfarr = array(
+                    'account_balance'        =>$data['account_balance']-$vo['amount'],
+                );
+                $id=$data['id'];
+                m('c_fund_account')->update($zfarr,"`id`='$id'");
+
+                $freeze = array(
+                    'freeze_amount' => $data['freeze_amount'] - $vo['amount'],
+                );
+
+                m('c_fund_account')->update($freeze, "`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']+$vo['amount'],
+                );
+                m('c_cbzx')->update($cbarr,"`code`='$cbzx'");
+                //账户明细 c_account_detail
+                $account_detail=array(
+                    'account' => $data['name'],
+                    'opt_type' => 2,
+                    'amount' =>$vo['amount'],
+                    'trans_numb' => $this->rs['docnum'],
+                    'account_balance' => $data['account_balance']-$vo['amount'],
+                    'create_time'  =>date("Y-m-d H:i:s"),
+                    'uid'  =>$this->rs['uid'],
+                );
+
+                m('c_account_detail')->insert($account_detail);
+
+                // 电费12
+
+
+                $fund_detail=array(
+                    'trans_numb' =>$this->rs['docnum'],
+                    'account' =>  $data['name'],
+                    'toaccount' =>$this->rs['applicant'],
+                    'trans_amount' =>$vo['amount'],
+                    'business_type' =>12,
+                    'opt_type' =>2,
+                    'account_balance'=>$data['account_balance']-$vo['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/fund_depositModel.php

-<?php
-class flow_fund_depositClassModel extends flowModel
-{
-	
-	  public function flowrsreplace($rs)
-    {
-
-
-         if($rs['business_type']){
-                $data=$this->db->getone('oa_option',"num='".$rs['business_type']."' and pid=1350");
-                $rs['business_type']=$data['name'];
-            }
-            
-    
-            return $rs;
-        }
-
-
-	//提交时调用
-	protected function flowcheckfinsh($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'");
-	                 
-	
-
-
-	     $toacc_detail = array(
-                    'account'        => $this->rs['toaccount'],
-                    'opt_type'        =>  1,
-                    'amount'        => $this->rs['trans_amount'],
-                    '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

@@ -2,12 +2,16 @@
 class flow_fund_transferClassModel extends flowModel
 {
 	
-
+    
 	
   public function flowrsreplace($rs)
     {
-
-
+        $uid=$this->adminid;
+        $sql="account in ( select a.name from oa_c_fund_account as a where uid like concat({$uid},',%') or uid like concat('%,',{$uid}) or uid like concat('%,',{$uid},',%') )";
+        $fund_detail = m('c_fund_detail')->getall($sql,'account');
+        foreach ($fund_detail as $key => $value){
+            $allaccount[]=$value['account'];
+        }
          if($rs['business_type']){
                 $data=$this->db->getone('oa_option',"num='".$rs['business_type']."' and pid=1350");
                 $rs['business_type']=$data['name'];
@@ -29,6 +33,13 @@ class flow_fund_transferClassModel extends flowModel
                         }
                         continue;
                         break;
+                     case 'account':
+                    if(!in_array($v,$allaccount)){
+                        $rs['account_balance']='***';
+                    }else{
+                        $rs['account_balance']=$rs['account_balance'];
+                    }
+                    break;
                 }
                
             }
@@ -66,6 +77,7 @@ class flow_fund_transferClassModel extends flowModel
             $account_balance=$data['account_balance']-$this->rs['trans_amount'];//当前余额
             $detail = array(
             'account_balance'        =>$account_balance,
+             'opt_type'        =>2,
             );
             m('c_fund_detail')->update($detail,"`id`='$id'");
 
@@ -73,7 +85,7 @@ class flow_fund_transferClassModel extends flowModel
 
              $acc_detail = array(
                     'account'        => $this->rs['account'],
-                    'opt_type'        =>  2,
+                    'opt_type'        =>2,
                     'amount'        => $this->rs['trans_amount'],
                     'account_balance'        =>$data['account_balance']-$this->rs['trans_amount'],
                     'trans_numb'        => $this->rs['trans_numb'],
@@ -84,7 +96,7 @@ class flow_fund_transferClassModel extends flowModel
 
                  $toacc_detail = array(
                     'account'        => $this->rs['toaccount'],
-                    'opt_type'        =>  1,
+                    'opt_type'        =>1,
                     'amount'        => $this->rs['trans_amount'],
                     'account_balance'        =>$toaccount_list['account_balance']+$this->rs['trans_amount'],
                     'trans_numb'        => $this->rs['trans_numb'],

webmain/model/flow/oafkModel.php

@@ -9,25 +9,159 @@ class flow_oafkClassModel extends flowModel
         return $rs;
     }
 
+	//二级 或一级审批同意之后进行预扣款
+	protected function flowcheckbefore($zt, $sm){
+		$id=$this->rs['id'];
+        $sql = " mid ='$id' and `table`='c_fininfom_oafk' ";
+	    $flow_bill = m('flow_bill')->getone($sql,'allcheckid');
+	    $allcheckid=explode(',',$flow_bill['allcheckid']);
+        $option = m('option')->getall('pid = 1533 and num =1 order by sort desc','num,name,value,sort');
+        foreach ($option as $key => $value) {
+        	if(in_array($value['value'], $allcheckid)){
+        		$checkid= $value['value'];
+        		break;
+        	}
+        }
+
+	    if(empty($checkid)){
+            $option = m('option')->getall('pid = 1533 and num =2 order by sort desc','num,name,value,sort,`explain`');
+            foreach ($option as $key => $value) {
+        	if(in_array($value['value'], $allcheckid)){
+        		$checkid= $value['value'];
+        		$explain= $value['explain'];
+        		break;
+        	}
+          }
+	    }
+
+
+		//zt 1代表同意
+        if($zt==1){
+ 		$flowid=$this->getflow();
+        if($explain){
+        if($flowid['nowcheckid']==$checkid &&  $flowid['nowcourseid']==$explain){
+		      $data = m('c_fund_details_fk')->getall('mid='.$this->rs['id'], 'id,cbzx_code,charge_amount');
+		      foreach ($data as $key => $vo) {
+		      	 $cbzx_code=$vo['cbzx_code'];
+		         $sql = " cost_id='$cbzx_code' and status = 1 and  is_default=1";
+		      	 $cost = m('c_fund_account')->getone($sql, 'id,type,freeze_amount,account_balance');//查询账户表成本中心
+
+		      	 if($cost['type']=='1'){		      	 
+		      	 if(($cost['account_balance']-$cost['freeze_amount'])<$vo['charge_amount']){
+		      	 	 return "账户余额不足";die;
+		      	 }
+		      	}
+				 $id=$cost['id'];
+
+				 $c_withhold = array(
+				   	'fund_account_id' => $id,
+				   	'docnum' => $this->rs['docnum'],
+				    'cost_id' => $vo['cbzx_code'],
+				    'amount' =>  $vo['charge_amount'],
+				    'status' => 1,
+				    'create_time' => date("Y-m-d H:i:s"),
+				    'uid' => $this->rs['uid'],
+				  );
+				 m('c_withhold')->insert($c_withhold);
+
+				//修改冻结余额
+				 $freeze = array(
+				  'freeze_amount' => $cost['freeze_amount'] + $vo['charge_amount'],
+				);
+			
+				m('c_fund_account')->update($freeze, "`id`='$id'");
+		      }
+		    }
+        }else{
+        		if($flowid['nowcheckid']==$checkid){
+		      $data = m('c_fund_details_fk')->getall('mid='.$this->rs['id'], 'id,cbzx_code,charge_amount');
+
+		      foreach ($data as $key => $vo) {
+		      	 $cbzx_code=$vo['cbzx_code'];
+		         $sql = " cost_id='$cbzx_code' and status = 1 and  is_default=1";
+		      	 $cost = m('c_fund_account')->getone($sql, 'id,type,freeze_amount,account_balance');//查询账户表成本中心id
+ 				 if($cost['type']=='1'){
+		      	 if(($cost['account_balance']-$cost['freeze_amount'])<$vo['charge_amount']){
+		      	 	 return "账户余额不足";die;
+		      	 }
+		      	}
+				 $id=$cost['id'];
+
+				 $c_withhold = array(
+				   	'fund_account_id' => $id,
+				   	'docnum' => $this->rs['docnum'],
+				    'cost_id' => $vo['cbzx_code'],
+				    'amount' =>  $vo['charge_amount'],
+				    'status' => 1,
+				    'create_time' => date("Y-m-d H:i:s"),
+				    'uid' => $this->rs['uid'],
+				  );
+				 m('c_withhold')->insert($c_withhold);
+
+				//修改冻结余额
+				 $freeze = array(
+				  'freeze_amount' => $cost['freeze_amount'] + $vo['charge_amount'],
+				);
+			
+				m('c_fund_account')->update($freeze, "`id`='$id'");
+		      }
+		    }
+          }
+         }else{
+                 $docnum=$this->rs['docnum'];
+                 //将单据状态作废余额
+                
+		         $withhold_cost = m('c_withhold')->getall("docnum='$docnum' and status =1", 'id,cost_id,amount');
+       
+		         foreach ($withhold_cost as $key => $vo) {
+                 //减去冻结金额
+                 $cost_id=$vo['cost_id'];
+				 $sql = " cost_id='$cost_id' and status = 1 and  is_default=1";
+		      	 $fund_account_cost = m('c_fund_account')->getone($sql, 'id,freeze_amount');
+              
+                 $id=$fund_account_cost['id'];
+				 $freeze = array(
+				  'freeze_amount' => $fund_account_cost['freeze_amount'] - $vo['amount'],
+				);
+			   
+				m('c_fund_account')->update($freeze, "`id`='$id'");
+              
+			    }
+
+
+				 $status = array(
+				  'status' => 0,
+				 );
+				 m('c_withhold')->update($status, "docnum='$docnum'");
+         }
+     }
     
-    //流程全部完成后调用
-	protected function flowcheckfinsh($zt){
+   //流程全部完成后调用
+	 protected function flowcheckfinsh($zt){
 
-			$mid= $this->rs['id'];
-			$datafk = m('c_fund_details_fk')->getall('mid='.$mid);
-          foreach ($datafk as $key => $value) {
+         
+			$docnum=$this->rs['docnum'];
+			$withhold_cost = m('c_withhold')->getall("docnum='$docnum' and status =1", 'id,cost_id,amount');
+       
+		    foreach ($withhold_cost as $key => $vo) {
            // 扣除账户余额 c_fund_account account_balance
            
-			$cbzxid= $value['cbzx_code'];
+			$cbzxid= $vo['cost_id'];
 			$model = 'c_fund_account';
 			$sql = " cost_id ='$cbzxid' and status = 1 and  is_default=1";
-			$data = m($model)->getone($sql,'id,name,account_balance');
+			$data = m($model)->getone($sql,'id,name,account_balance,freeze_amount');
 
 			$zfarr = array(
-			'account_balance'        =>$data['account_balance']-$value['charge_amount'],
+			'account_balance'        =>$data['account_balance']-$vo['amount'],
 			);
 			$id=$data['id'];
 			m('c_fund_account')->update($zfarr,"`id`='$id'");
+            
+            $freeze = array(
+		    'freeze_amount' => $data['freeze_amount'] - $vo['amount'],
+				);
+			   
+		    m('c_fund_account')->update($freeze, "`id`='$id'");
 
 			   // 成本中心 amount 变更
 			$cbzx = substr($cbzxid,0,strrpos($cbzxid,"（"));
@@ -35,16 +169,16 @@ class flow_oafkClassModel extends flowModel
 
 			$cbzxdata = m('c_cbzx')->getone($cbzxsql,'id,amount');
 			$cbarr = array(
-			'amount'        =>$cbzxdata['amount']+$value['charge_amount'],
+			'amount'        =>$cbzxdata['amount']+$vo['amount'],
 			);
             m('c_cbzx')->update($cbarr,"`code`='$cbzx'");
              //账户明细 c_account_detail
 			$account_detail=array(
 			'account' => $data['name'],
 			'opt_type' => 2,
-			'amount' =>$value['charge_amount'],
+			'amount' =>$vo['amount'],
 			'trans_numb' => $this->rs['docnum'],
-			'account_balance' => $data['account_balance']-$value['charge_amount'],
+			'account_balance' => $data['account_balance']-$vo['amount'],
 			'create_time'  =>date("Y-m-d H:i:s"),
 			'uid'  =>$this->rs['uid'],
 			);
@@ -58,16 +192,18 @@ class flow_oafkClassModel extends flowModel
 			'trans_numb' =>$this->rs['docnum'],
 			'account' =>  $data['name'],
 			'toaccount' =>$this->rs['payee'],
-			'trans_amount' =>$value['charge_amount'],
+			'trans_amount' =>$vo['amount'],
 			'business_type' =>8,
 			'opt_type' =>2,
-			'account_balance'=>$data['account_balance']-$value['charge_amount'],
+			'account_balance'=>$data['account_balance']-$vo['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/oafkModel.php.bak

+<?php
+
+class flow_oafkClassModel extends flowModel
+
+{
+    public function flowrsreplace($rs)
+    {
+        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

@@ -10,24 +10,161 @@ class flow_oayfkClassModel extends flowModel
     }
 
 
-        //流程全部完成后调用
+
+	//二级 或一级审批同意之后进行预扣款
+	protected function flowcheckbefore($zt, $sm){
+		$id=$this->rs['id'];
+        $sql = " mid ='$id' and `table`='c_fininfom_oayfk' ";
+	    $flow_bill = m('flow_bill')->getone($sql,'allcheckid');
+
+
+	    $allcheckid=explode(',',$flow_bill['allcheckid']);
+        $option = m('option')->getall('pid = 1550 and num =1 order by sort desc','num,name,value,sort');
+        foreach ($option as $key => $value) {
+        	if(in_array($value['value'], $allcheckid)){
+        		$checkid= $value['value'];
+        		break;
+        	}
+        }
+
+	    if(empty($checkid)){
+            $option = m('option')->getall('pid = 1550 and num =2 order by sort desc','num,name,value,sort,`explain`');
+            foreach ($option as $key => $value) {
+        	if(in_array($value['value'], $allcheckid)){
+        		$checkid= $value['value'];
+        		$explain= $value['explain'];
+        		break;
+        	}
+          }
+	    }
+
+		//zt 1代表同意
+        if($zt==1){
+
+ 		$flowid=$this->getflow();
+        if($explain){
+
+        if($flowid['nowcheckid']==$checkid &&  $flowid['nowcourseid']==$explain){
+		      $data = m('c_fund_details_yfk')->getall('mid='.$this->rs['id'], 'id,cbzx_code,charge_amount');
+		      foreach ($data as $key => $vo) {
+		      	 $cbzx_code=$vo['cbzx_code'];
+		         $sql = " cost_id='$cbzx_code' and status = 1 and  is_default=1";
+		      	 $cost = m('c_fund_account')->getone($sql, 'id,type,freeze_amount,account_balance');//查询账户表成本中心
+		      	 if($cost['type']=='1'){		      	 
+		      	 if(($cost['account_balance']-$cost['freeze_amount'])<$vo['charge_amount']){
+		      	 	 return "账户余额不足";die;
+		      	 }
+		      	}
+				 $id=$cost['id'];
+
+				 $c_withhold = array(
+				   	'fund_account_id' => $id,
+				   	'docnum' => $this->rs['docnum'],
+				    'cost_id' => $vo['cbzx_code'],
+				    'amount' =>  $vo['charge_amount'],
+				    'status' => 1,
+				    'create_time' => date("Y-m-d H:i:s"),
+				    'uid' => $this->rs['uid'],
+				  );
+				 m('c_withhold_yfk')->insert($c_withhold);
+
+				//修改冻结余额
+				 $freeze = array(
+				  'freeze_amount' => $cost['freeze_amount'] + $vo['charge_amount'],
+				);
+			
+				m('c_fund_account')->update($freeze, "`id`='$id'");
+		      }
+		    }
+        }else{
+        		if($flowid['nowcheckid']==$checkid){
+		      $data = m('c_fund_details_yfk')->getall('mid='.$this->rs['id'], 'id,cbzx_code,charge_amount');
+		      foreach ($data as $key => $vo) {
+		      	 $cbzx_code=$vo['cbzx_code'];
+		         $sql = " cost_id='$cbzx_code' and status = 1 and  is_default=1";
+		      	 $cost = m('c_fund_account')->getone($sql, 'id,type,freeze_amount,account_balance');//查询账户表成本中心
+		      	 if($cost['type']=='1'){		      	 
+		      	 if(($cost['account_balance']-$cost['freeze_amount'])<$vo['charge_amount']){
+		      	 	 return "账户余额不足";die;
+		      	 }
+		      	}
+				 $id=$cost['id'];
+				 $c_withhold = array(
+				   	'fund_account_id' => $id,
+				   	'docnum' => $this->rs['docnum'],
+				    'cost_id' => $vo['cbzx_code'],
+				    'amount' =>  $vo['charge_amount'],
+				    'status' => 1,
+				    'create_time' => date("Y-m-d H:i:s"),
+				    'uid' => $this->rs['uid'],
+				  );
+				 m('c_withhold_yfk')->insert($c_withhold);
+
+				//修改冻结余额
+				 $freeze = array(
+				  'freeze_amount' => $cost['freeze_amount'] + $vo['charge_amount'],
+				);
+			
+				m('c_fund_account')->update($freeze, "`id`='$id'");
+		      }
+		    }
+          }
+         }else{
+                 $docnum=$this->rs['docnum'];
+                 //将单据状态作废余额
+                
+		         $withhold_cost = m('c_withhold_yfk')->getall("docnum='$docnum' and status =1", 'id,cost_id,amount');
+       
+		         foreach ($withhold_cost as $key => $vo) {
+                 //减去冻结金额
+                 $cost_id=$vo['cost_id'];
+				 $sql = " cost_id='$cost_id' and status = 1 and  is_default=1";
+		      	 $fund_account_cost = m('c_fund_account')->getone($sql, 'id,freeze_amount');
+              
+                 $id=$fund_account_cost['id'];
+				 $freeze = array(
+				  'freeze_amount' => $fund_account_cost['freeze_amount'] - $vo['amount'],
+				);
+			   
+				m('c_fund_account')->update($freeze, "`id`='$id'");
+              
+			    }
+
+
+				 $status = array(
+				  'status' => 0,
+				 );
+				 m('c_withhold_yfk')->update($status, "docnum='$docnum'");
+         }
+     }
+    
+
+
+ //        //流程全部完成后调用
 	protected function flowcheckfinsh($zt){
 
-			$mid= $this->rs['id'];
-			$datafk = m('c_fund_details_yfk')->getall('mid='.$mid);
-          foreach ($datafk as $key => $value) {
+			$docnum=$this->rs['docnum'];
+			$withhold_cost = m('c_withhold_yfk')->getall("docnum='$docnum' and status =1", 'id,cost_id,amount');
+       
+		    foreach ($withhold_cost as $key => $vo) {
            // 扣除账户余额 c_fund_account account_balance
            
-			$cbzxid= $value['cbzx_code'];
+			$cbzxid= $vo['cost_id'];
 			$model = 'c_fund_account';
 			$sql = " cost_id ='$cbzxid' and status = 1 and  is_default=1";
-			$data = m($model)->getone($sql,'id,name,account_balance');
+			$data = m($model)->getone($sql,'id,name,account_balance,freeze_amount');
 
 			$zfarr = array(
-			'account_balance'        =>$data['account_balance']-$value['charge_amount'],
+			'account_balance'        =>$data['account_balance']-$vo['amount'],
 			);
 			$id=$data['id'];
 			m('c_fund_account')->update($zfarr,"`id`='$id'");
+            
+            $freeze = array(
+		    'freeze_amount' => $data['freeze_amount'] - $vo['amount'],
+				);
+			   
+		    m('c_fund_account')->update($freeze, "`id`='$id'");
 
 			   // 成本中心 amount 变更
 			$cbzx = substr($cbzxid,0,strrpos($cbzxid,"（"));
@@ -35,16 +172,16 @@ class flow_oayfkClassModel extends flowModel
 
 			$cbzxdata = m('c_cbzx')->getone($cbzxsql,'id,amount');
 			$cbarr = array(
-			'amount'        =>$cbzxdata['amount']+$value['charge_amount'],
+			'amount'        =>$cbzxdata['amount']+$vo['amount'],
 			);
             m('c_cbzx')->update($cbarr,"`code`='$cbzx'");
              //账户明细 c_account_detail
 			$account_detail=array(
 			'account' => $data['name'],
 			'opt_type' => 2,
-			'amount' =>$value['charge_amount'],
+			'amount' =>$vo['amount'],
 			'trans_numb' => $this->rs['docnum'],
-			'account_balance' => $data['account_balance']-$value['charge_amount'],
+			'account_balance' => $data['account_balance']-$vo['amount'],
 			'create_time'  =>date("Y-m-d H:i:s"),
 			'uid'  =>$this->rs['uid'],
 			);
@@ -58,16 +195,17 @@ class flow_oayfkClassModel extends flowModel
 			'trans_numb' =>$this->rs['docnum'],
 			'account' =>  $data['name'],
 			'toaccount' =>$this->rs['payee'],
-			'trans_amount' =>$value['charge_amount'],
+			'trans_amount' =>$vo['amount'],
 			'business_type' =>10,
 			'opt_type' =>2,
-			'account_balance'=>$data['account_balance']-$value['charge_amount'],
+			'account_balance'=>$data['account_balance']-$vo['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/supplierModel.php

@@ -123,7 +123,7 @@ class flow_supplierClassModel extends flowModel
         	$cloudUrl = "http://192.168.1.211/k3cloud/";
 			//登陆参数
 			$data = array(
-			'5d64e2f4ecb139',//帐套Id
+			'5e64f6ff0bd47f',//帐套Id
 			'Administrator',//用户名
 			'666666',//密码
 			'2052'//语言标识359010087

webmain/webmainConfig.php

+<?php
+if(!defined('HOST'))die('not access');
+//[管理员]在2020-05-06 11:27:31通过[系统→系统工具→系统设置]，保存修改了配置文件
+$config =  array(
+	'localurl'	=> '',	//本地系统URL，用于服务器上浏览地址
+	'db_engine'	=> 'MyISAM',
+	'perfix'	=> 'oa_',	//数据库表名前缀
+	'qom'	=> '',	//session、cookie前缀
+	'highpass'	=> '',	//超级管理员密码，可用于登录任何帐号
+	'db_drive'	=> 'mysqli',	//操作数据库驱动有mysql,mysqli,pdo三种
+	'randkey'	=> 'zbxmrnlidsugyohaqejkfvpctw',	//系统随机字符串密钥
+	'asynkey'	=> 'ed42c6c72f7b5f9779e03921e335adc7',	//这是异步任务key
+	'openkey'	=> '5bdfcedb618e1e03abf18e391278c1f4',	//对外接口openkey
+	'updir'	=> 'upload',
+	'sqllog'	=> true,	//是否记录sql日志保存upload/sqllog下
+	'asynsend'	=> '0',	//是否异步发送提醒消息，0同步，1自己服务端异步，2官网VIP用户异步
+	'editpass'	=> '1',	//用户登录修改密码：0不用修改，1强制用户必须修改
+	'install'	=> true,	//已安装，不要去掉啊
+	'outurl'	=> '',	//这个地址当你内网地址访问时向手机推送消息的地址
+	'reimtitle'	=> '',	//REIM即时通信上标题
+	'qqmapkey'	=> '',
+	'xinhukey'	=> '9c204945d725d0766f9fcb0ead720515',	//信呼官网key，用于在线升级使用
+	'bcolorxiang'	=> '',	//单据详情页面上默认展示线条的颜色
+	'officeyl'	=> '0',	//文档Excel.Doc预览类型,0自己部署插件，1使用官网支持任何平台
+	'useropt'	=> '1',	//1记录用户操作保存到日志里,空不记录
+	'defstype'	=> '1',	//PC后台主题皮肤，可以设置1到34
+	'debug'	=> true,	//为true调试开发模式,false上线模式
+	'reim_show'	=> false,	//首页是否显示REIM
+	'mobile_show'	=> true,	//首页是否显示手机版
+	'companymode'	=> true,	//多单位模式，true就是开启
+	'loginyzm'	=> '0',	//登录方式:0仅使用帐号+密码,1帐号+密码/手机+验证码,2帐号+密码+验证码,3仅使用手机+验证码
+
+);
+
+$defaultConfig = require_once 'default_config.php';
+
+return array_merge($config,$defaultConfig);