Skip to content

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

Merge branch 'master' into test

Conflicts: webmain/model/flow/finfybxModel.php webmain/model/loginModel.php webmain/task/openapi/openfkinfoAction.php 修改： custmoer.txt 修改： supplier.txt 新文件： webmain/flow/input/inputjs/mode_assetmbuy.js 新文件： webmain/flow/input/inputjs/mode_assetmoperate.js 新文件： webmain/flow/input/inputjs/mode_assetmselfequipped.js 新文件： webmain/flow/input/inputjs/mode_assetmuse.js 修改： webmain/flow/input/inputjs/mode_contract_list.js 新文件： webmain/flow/input/mode_assetmbuyAction.php 新文件： webmain/flow/input/mode_assetmoperateAction.php 新文件： webmain/flow/input/mode_assetmselfequippedAction.php 新文件： webmain/flow/input/mode_assetmuseAction.php 修改： webmain/flow/input/mode_contract_listAction.php 修改： webmain/flow/page/input_assetm.html 新文件： webmain/flow/page/input_assetmbuy.html 新文件： webmain/flow/page/input_assetmoperate.html 新文件： webmain/flow/page/input_assetmselfequipped.html 新文件： webmain/flow/page/input_assetmuse.html 修改： webmain/flow/page/input_contract_list.html 修改： webmain/flow/page/input_goodly.html 修改： webmain/flow/page/rock_page_account_detail.php 修改： webmain/flow/page/rock_page_account_list.php 新文件： webmain/flow/page/rock_page_assetm.php 新文件： webmain/flow/page/rock_page_assetmbuy.php 新文件： webmain/flow/page/rock_page_assetmoperate.php 新文件： webmain/flow/page/rock_page_assetmselfequipped.php 新文件： webmain/flow/page/rock_page_assetmuse.php 修改： webmain/flow/page/rock_page_cost_center.php 修改： webmain/flow/page/rock_page_fund_deposit.php 修改： webmain/flow/page/rock_page_fund_transfer.php 修改： webmain/flow/page/rock_page_goodly.php 新文件： webmain/flow/page/view_assetm_0.html 新文件： webmain/flow/page/view_assetmbuy_0.html 新文件： webmain/flow/page/view_assetmoperate_0.html 新文件： webmain/flow/page/view_assetmselfequipped_0.html 新文件： webmain/flow/page/view_assetmuse_0.html 新文件： webmain/model/1 修改： webmain/model/flow/finfybxModel.php 修改： webmain/model/flow/fund_depositModel.php 修改： webmain/model/flow/fund_transferModel.php 修改： webmain/model/loginModel.php
上级 7caaa332 cd3e6d8c
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 262 行增加 和 20 行删除
.gitattributes 0 → 100755
浏览文件 @ 9049fe3c
config/config.php merge=ours
webmain/model/loginModel.php merge=ours
webmain/webmainConfig.php merge=ours
.idea/ merge=ours
images/OA二维码.png merge=ours
custmoer.txt
浏览文件 @ 9049fe3c
......@@ -37,3 +37,4 @@
客户名称：北京闪思科技有限公司保存接口失败 客户编号：CUST24055保存接口成功 执行时间：3.2373831272125 s
客户编号：CUST24055提交接口成功 执行时间：1.2542500495911 s
客户编号：CUST24055审核接口成功 执行时间：0.16617202758789 s
客户名称：北京正佳伟业科技有限公司保存接口失败 客户名称：余怀领保存接口失败
\ No newline at end of file
supplier.txt
浏览文件 @ 9049fe3c
......@@ -140,3 +140,7 @@
供应商名称：北京众唐家园物业管理有限公司保存接口失败 供应商编号：VEN05007保存接口成功 执行时间：3.5164778232574 s
供应商编号：VEN05007提交接口成功 执行时间：1.2535090446472 s
供应商编号：VEN05007审核接口成功 执行时间：0.16562795639038 s
供应商编号：VEN05017保存接口成功 执行时间：1.8839001655579 s
供应商编号：VEN05017提交接口成功 执行时间：1.0340170860291 s
供应商编号：VEN05017审核接口成功 执行时间：0.1566698551178 s
供应商名称：中建物业建筑有限公司保存接口失败 供应商名称：北京起凡通信工程有限公司保存接口失败 供应商名称：北京雪莲集团有限公司北京衬衫厂保存接口失败
\ No newline at end of file
webmain/flow/input/inputjs/mode_assetmbuy.js 0 → 100755
浏览文件 @ 9049fe3c
//流程模块【assetmbuy.固定资产购买】下录入页面自定义js页面,初始函数
function initbodys(){
}
\ No newline at end of file
webmain/flow/input/inputjs/mode_assetmoperate.js 0 → 100755
浏览文件 @ 9049fe3c
//流程模块【assetmoperate.固定资产维修/报废/出售】下录入页面自定义js页面,初始函数
function initbodys(){
}
\ No newline at end of file
webmain/flow/input/inputjs/mode_assetmselfequipped.js 0 → 100755
浏览文件 @ 9049fe3c
//流程模块【assetmselfequipped.自行配备电脑】下录入页面自定义js页面,初始函数
function initbodys(){
}
\ No newline at end of file
webmain/flow/input/inputjs/mode_assetmuse.js 0 → 100644
浏览文件 @ 9049fe3c
//流程模块【assetmuse.固定资产申领】下录入页面自定义js页面,初始函数
function initbodys(){
c.onselectdata['assetmnumb']=function(d){
js.ajax(geturlact('getassetmnumb'),{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);
},'post,json');
};
}
\ No newline at end of file
webmain/flow/input/inputjs/mode_contract_list.js 100755 → 100644
浏览文件 @ 9049fe3c
File mode changed from 100755 to 100644
webmain/flow/input/mode_assetmbuyAction.php 0 → 100755
浏览文件 @ 9049fe3c
<?php
/**
* 此文件是流程模块【assetmbuy.固定资产购买】对应控制器接口文件。
*/
class mode_assetmbuyClassAction 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_assetmoperateAction.php 0 → 100755
浏览文件 @ 9049fe3c
<?php
/**
* 此文件是流程模块【assetmoperate.固定资产维修/报废/出售】对应控制器接口文件。
*/
class mode_assetmoperateClassAction 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_assetmselfequippedAction.php 0 → 100755
浏览文件 @ 9049fe3c
<?php
/**
* 此文件是流程模块【assetmselfequipped.自行配备电脑】对应控制器接口文件。
*/
class mode_assetmselfequippedClassAction 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 0 → 100644
浏览文件 @ 9049fe3c
<?php
/**
* 此文件是流程模块【assetmuse.固定资产申领】对应控制器接口文件。
*/
class mode_assetmuseClassAction 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){
}
public function getassetmnumbAjax(){
$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");
$this->returnjson($data);
}
}
\ No newline at end of file
webmain/flow/input/mode_contract_listAction.php 100755 → 100644
浏览文件 @ 9049fe3c
File mode changed from 100755 to 100644
webmain/flow/page/input_assetm.html
浏览文件 @ 9049fe3c
<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" rowspan="3">封面图片</td><td class="ys2" rowspan="3">{fengmian}<br /></td></tr><tr><td height="34" align="right" class="ys1">*资产分类</td><td class="ys2">{typeid}</td></tr><tr><td height="34" align="right" class="ys1">*名称</td><td class="ys2">{title}</td></tr><tr><td height="34" align="right" class="ys1">*存放仓库</td><td class="ys2">{ckid}</td><td align="right" class="ys1">品牌</td><td class="ys2">{brand}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">规格型号</td><td width="35%" class="ys2">{model}</td><td width="15%" align="right" class="ys1">使用人</td><td width="35%" class="ys2">{usename}</td></tr><tr><td height="34" align="right" class="ys1">*资产来源</td><td class="ys2">{laiyuan}</td><td align="right" class="ys1">*状态</td><td class="ys2">{state}</td></tr><tr><td height="34" align="right" class="ys1">购进日期</td><td class="ys2">{buydt}</td><td align="right" class="ys1">价格</td><td class="ys2">{price}</td></tr><tr><td height="34" align="right" class="ys1">说明</td><td class="ys2" colspan="3">{explain}</td></tr><tr><td height="34" align="right" class="ys1">相关文件</td><td class="ys2" colspan="3">{file_content}</td></tr></tbody></table>
\ No newline at end of file
<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="font-size:small;text-indent:28px;white-space:normal;">*状态</span><br /></td><td class="ys2"><span style="font-size:small;text-indent:28px;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;">{laiyuan}</span><br /></td></tr><tr><td height="34" align="right" class="ys1"><span style="text-align:-webkit-right;white-space:normal;">*使用人</span><br /></td><td class="ys2"><span style="white-space:normal;">{usename}</span> </td><td align="right" class="ys1"><span style="text-align:-webkit-right;white-space:normal;">*使用人部门</span><br /></td><td class="ys2"><span style="white-space:normal;">{shuname}</span> </td></tr><tr><td height="34" width="15%" align="right" class="ys1">*资产名称<br /></td><td width="35%" class="ys2">{title}</td><td width="15%" align="right" class="ys1"><span style="text-align:-webkit-right;white-space:normal;">价格</span> </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">{oanumb}</td></tr><tr><td height="34" align="right" class="ys1">使用人更迭记录</td><td class="ys2">{userchangerecord}</td><td align="right" class="ys1">最近使用人更迭日期</td><td class="ys2">{recentuserchangedate}</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="text-align:-webkit-right;white-space:normal;">*型号</span> </td><td class="ys2" colspan="3"><span style="white-space:normal;">{model-xh}</span> </td></tr><tr><td class="ys1" style="text-align:right;">*机器编号<br /></td><td class="ys1">{model-bh}<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}<br /></td><td class="ys1" style="text-align:right;">操作系统<br /></td><td class="ys1">{model-os}<br /></td></tr></tbody></table></p>
\ No newline at end of file
webmain/flow/page/input_assetmbuy.html 0 → 100755
浏览文件 @ 9049fe3c
<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" colspan="3">{assetmtype}<br /></td></tr><tr><td class="ys1" style="text-align:center;background-color:#CCCCCC;">*资产名称<br /></td><td class="ys2">{assetmname}<br /></td><td class="ys1" style="text-align:center;background-color:#CCCCCC;">*申购数量<br /></td><td class="ys2">{assetmamount}<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 />
\ No newline at end of file
webmain/flow/page/input_assetmoperate.html 0 → 100755
浏览文件 @ 9049fe3c
<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;">*操作动作</td><td class="ys2" colspan="3">{assetmoperatetype}<br /></td></tr><tr><td class="ys1" style="text-align:center;background-color:#CCCCCC;">*资产名称<br /></td><td class="ys2">{assetmname}<br /></td><td class="ys1" style="text-align:center;background-color:#CCCCCC;">*资产编号<br /></td><td class="ys2">{assetmnumb}<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 class="ys1" style="text-align:center;background-color:#CCCCCC;">资产价值<br /></td><td class="ys2">{assetmvalue}<br /></td><td class="ys1" style="text-align:center;background-color:#CCCCCC;">出售/维修价格<br /></td><td class="ys2">{price}<br /></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 />
\ No newline at end of file
webmain/flow/page/input_assetmselfequipped.html 0 → 100755
浏览文件 @ 9049fe3c
<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" colspan="3">{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;">{subsidyway}</span><br /></td></tr></tbody></table></p><br />
\ No newline at end of file
webmain/flow/page/input_assetmuse.html 0 → 100755
浏览文件 @ 9049fe3c
<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 />
\ No newline at end of file
webmain/flow/page/input_contract_list.html
浏览文件 @ 9049fe3c
<p><table class="" style="width:100%;" bordercolor="#000000" border="1"><tbody><tr><td style="width:15%;background-color:#CCCCCC;" class="ys1" width="15%" align="center">*合同名称</td><td class="ys2" width="35%">{title}</td><td style="width:15%;background-color:#CCCCCC;" class="ys1" width="15%" align="center">*合同编号</td><td class="ys2" width="35%">{numb}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*所属部门</td><td class="ys2">{departmentname}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*业务线</td><td class="ys2">{busi_line}{businame}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*合同类型</td><td class="ys2">{finance_type}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*收款方</td><td class="ys2" style="text-align:left;vertical-align:bottom;">{receive}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*甲方</td><td class="ys2" style="text-align:left;vertical-align:bottom;">{part_a}{parta_name}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*乙方</td><td class="ys2">{part_b}{partb_name}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">第三方</td><td class="ys2" style="text-align:left;vertical-align:bottom;">{part_c}{partc_name}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">主合同编号</td><td class="ys2">{pid}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">收款银行账号</td><td class="ys2" style="text-align:left;vertical-align:bottom;">{bankcode}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*合同金额(元)</td><td class="ys2">{amount}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*签订员工</td><td class="ys2">{staff}{staffname}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*签订日期</td><td class="ys2">{sign_date}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*生效日期</td><td class="ys2">{create_date}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*结束日期</td><td class="ys2">{end_date}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*合同周期(天)</td><td class="ys1">{cycle}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*合同电子版上传</td><td class="ys2">{file_id}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">概要</td><td class="ys2" cospan="3">{info}</td></tr><tr><td colspan="4" style="background-color:#CCCCCC;"><b>款项</b> <span style="color:blue">合同金额在填写款项之后自动计算</span></td></tr><tr><td colspan="4"><table class="tablesub ke-zeroborder" id="tablesub0" style="width:100%;" cellspacing="0" cellpadding="0" border="0"><tbody><tr><td style="background-color:#CCCCCC;" width="5%">序号</td><td style="background-color:#CCCCCC;" width="15%">*款项</td><td style="background-color:#CCCCCC;" width="15%">*金额(元)</td><td style="background-color:#CCCCCC;" width="10%">*发票类型</td><td style="background-color:#CCCCCC;" width="10%">*税点</td><td style="background-color:#CCCCCC;" width="10%">*成本/收入模式<br /></td><td style="background-color:#CCCCCC;" width="25%">明细</td><td style="background-color:#CCCCCC;" width="10%">操作</td></tr><tr><td>[xuhao0,0]</td><td>[title0,0]</td><td>[amount0,0]</td><td>[invoicetype0,0]</td><td>[rate0,0]</td><td>[costmodel0,0]</td><td>[remark0,0]</td><td>{删,0}</td></tr></tbody></table><div style="background-color:#F1F1F1;">{新增,0}</div></td></tr><tr><td colspan="4"><strong>收付款计划</strong> </td></tr><tr><td colspan="4"><table class="tablesub ke-zeroborder" id="tablesub1" style="width:100%;" cellspacing="0" cellpadding="0" border="0"><tbody><tr><td style="background-color:#CCCCCC;" width="5%">批次</td><td style="background-color:#CCCCCC;" width="20%">*时间</td><td style="background-color:#CCCCCC;" width="20%">*金额(元)</td><td style="background-color:#CCCCCC;"><span style="text-indent:28px;white-space:normal;background-color:#CCCCCC;"><span style="text-indent:28px;white-space:normal;background-color:#CCCCCC;">说明</span></span> </td><td style="background-color:#CCCCCC;" width="10%">操作</td></tr><tr><td>[xuhao1,0][cycle_numb1,0]</td><td>[end_time1,0]</td><td>[amount1,0]</td><td>[remark1,0]</td><td>{删,1}</td></tr></tbody></table><div style="background-color:#F1F1F1;">{新增,1}</div></td></tr></tbody></table></p>
\ No newline at end of file
<p><table class="" style="width:100%;" bordercolor="#000000" border="1"><tbody><tr><td style="width:15%;background-color:#CCCCCC;" class="ys1" width="15%" align="center">*合同名称</td><td class="ys2" width="35%">{title}</td><td style="width:15%;background-color:#CCCCCC;" class="ys1" width="15%" align="center">*合同编号</td><td class="ys2" width="35%">{numb}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*所属部门</td><td class="ys2">{departmentname}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*业务线</td><td class="ys2">{busi_line}{businame}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*合同类型</td><td class="ys2">{finance_type}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*收款方</td><td class="ys2" style="text-align:left;vertical-align:bottom;">{receive}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*甲方</td><td class="ys2" style="text-align:left;vertical-align:bottom;">{part_a}{parta_name}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*乙方</td><td class="ys2">{part_b}{partb_name}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">第三方</td><td class="ys2" style="text-align:left;vertical-align:bottom;">{part_c}{partc_name}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">主合同编号</td><td class="ys2">{pid}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1"><span style="text-align:center;text-indent:28px;white-space:normal;background-color:#CCCCCC;">*</span>收款银行账号</td><td class="ys2" style="text-align:left;vertical-align:bottom;">{bankcode}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*合同金额(元)</td><td class="ys2">{amount}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*签订员工</td><td class="ys2">{staff}{staffname}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*签订日期</td><td class="ys2">{sign_date}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*生效日期</td><td class="ys2">{create_date}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*结束日期</td><td class="ys2">{end_date}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*合同周期(天)</td><td class="ys1">{cycle}</td><td style="text-align:center;background-color:#CCCCCC;" class="ys1">*合同电子版上传</td><td class="ys2">{file_id}</td></tr><tr><td style="text-align:center;background-color:#CCCCCC;" class="ys1">概要</td><td class="ys2" cospan="3">{info}</td></tr><tr><td colspan="4" style="background-color:#CCCCCC;"><b>款项</b> <span style="color:blue;">合同金额在填写款项之后自动计算</span></td></tr><tr><td colspan="4"><table class="tablesub ke-zeroborder" id="tablesub0" style="width:100%;" cellspacing="0" cellpadding="0" border="0"><tbody><tr><td style="background-color:#CCCCCC;" width="5%">序号</td><td style="background-color:#CCCCCC;" width="15%">*款项</td><td style="background-color:#CCCCCC;" width="15%">*金额(元)</td><td style="background-color:#CCCCCC;" width="10%">*发票类型</td><td style="background-color:#CCCCCC;" width="10%">*税点</td><td style="background-color:#CCCCCC;" width="10%">*成本/收入模式<br /></td><td style="background-color:#CCCCCC;" width="25%">明细</td><td style="background-color:#CCCCCC;" width="10%">操作</td></tr><tr><td>[xuhao0,0]</td><td>[title0,0]</td><td>[amount0,0]</td><td>[invoicetype0,0]</td><td>[rate0,0]</td><td>[costmodel0,0]</td><td>[remark0,0]</td><td>{删,0}</td></tr></tbody></table><div style="background-color:#F1F1F1;">{新增,0}</div></td></tr><tr><td colspan="4"><strong>收付款计划</strong> </td></tr><tr><td colspan="4"><table class="tablesub ke-zeroborder" id="tablesub1" style="width:100%;" cellspacing="0" cellpadding="0" border="0"><tbody><tr><td style="background-color:#CCCCCC;" width="5%">批次</td><td style="background-color:#CCCCCC;" width="20%">*时间</td><td style="background-color:#CCCCCC;" width="20%">*金额(元)</td><td style="background-color:#CCCCCC;"><span style="text-indent:28px;white-space:normal;background-color:#CCCCCC;"><span style="text-indent:28px;white-space:normal;background-color:#CCCCCC;">说明</span></span> </td><td style="background-color:#CCCCCC;" width="10%">操作</td></tr><tr><td>[xuhao1,0][cycle_numb1,0]</td><td>[end_time1,0]</td><td>[amount1,0]</td><td>[remark1,0]</td><td>{删,1}</td></tr></tbody></table><div style="background-color:#F1F1F1;">{新增,1}</div></td></tr></tbody></table></p><audio controls="controls" style="display:none;"></audio>
\ No newline at end of file
webmain/flow/page/input_goodly.html
浏览文件 @ 9049fe3c
<table width="100%" bordercolor="#000000" border="0" class="ke-zeroborder"><tbody><tr><td height="34" width="15%" align="right" class="ys1">*申请日期</td><td class="ys2" width="35%">{applydt}{type}</td><td align="right" class="ys1" width="15%"></td><td class="ys2" width="35%"></td></tr><tr><td class="ys2" style="background-color:#CCCCCC;" colspan="4"><strong>领用物品</strong> </td></tr><tr><td class="ys0" colspan="4"><table class="tablesub ke-zeroborder" id="tablesub0" style="width:100%;" border="0" cellspacing="0" cellpadding="0"><tbody><tr><td width="10%">序号</td><td>*物品</td><td>*领用数量</td><td width="5%">操作</td></tr><tr><td>[xuhao0,0]</td><td>[temp_aid0,0][aid0,0]</td><td>[count0,0]</td><td>{删,0}</td></tr></tbody></table><div style="background-color:#F1F1F1;">{新增,0}</div></td></tr><tr><td height="34" align="right" class="ys1">说明</td><td colspan="3" class="ys2">{explain}</td></tr><tr><td height="34" align="right" class="ys1">申请人</td><td class="ys2">{base_name}</td><td class="ys1" align="right">申请人部门</td><td class="ys2">{base_deptname}</td></tr></tbody></table>
\ No newline at end of file
<table width="100%" bordercolor="#000000" border="0" class="ke-zeroborder"><tbody><tr><td height="34" width="15%" align="right" class="ys1">*申请日期</td><td class="ys2" width="35%">{applydt}{type}</td><td align="right" class="ys1" width="15%"></td><td class="ys2" width="35%"></td></tr><tr><td class="ys2" style="background-color:#CCCCCC;" colspan="4"><strong>领用物品</strong> </td></tr><tr><td class="ys0" colspan="4"><table class="tablesub ke-zeroborder" id="tablesub0" style="width:100%;" border="0" cellspacing="0" cellpadding="0"><tbody><tr><td width="10%">序号</td><td>*物品</td><td>*领用数量</td><td>*领用人<br /></td><td width="5%">操作</td></tr><tr><td>[xuhao0,0]</td><td>[temp_aid0,0][aid0,0]</td><td>[count0,0]</td><td>[user0,0]<br /></td><td>{删,0}</td></tr></tbody></table><div style="background-color:#F1F1F1;">{新增,0}</div></td></tr><tr><td height="34" align="right" class="ys1">说明</td><td colspan="3" class="ys2">{explain}</td></tr><tr><td height="34" align="right" class="ys1">申请人</td><td class="ys2">{base_name}</td><td class="ys1" align="right">申请人部门</td><td class="ys2">{base_deptname}</td></tr></tbody></table><audio controls="controls" style="display:none;"></audio>
\ No newline at end of file
webmain/flow/page/rock_page_account_detail.php
浏览文件 @ 9049fe3c
......@@ -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":"0","isalign":"0","islb":"1"},{"fields":"account","name":"\u8d26\u6237\u540d\u79f0","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"opt_type","name":"\u4f59\u989d\u53d8\u66f4\u7c7b\u578b","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"amount","name":"\u91d1\u989d","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"account_balance","name":"\u8d26\u6237\u4f59\u989d","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u65f6\u95f4","fieldstype":"text","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":"\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 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"},{text:"账户名称",dataIndex:"account"},{text:"余额变更类型",dataIndex:"opt_type"},{text:"金额",dataIndex:"amount"},{text:"账户余额",dataIndex:"account_balance"},{text:"时间",dataIndex:"create_time"},{
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},{
text:'',dataIndex:'caozuo',callback:'opegs{rand}'
}],
itemdblclick:function(){
......
webmain/flow/page/rock_page_account_list.php
浏览文件 @ 9049fe3c
......@@ -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":"0","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":"0","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,update_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":"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 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"},{text:"账户状态",dataIndex:"status",sortable:true},{text:"账户余额",dataIndex:"account_balance"},{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:"create_time",sortable:true},{text:"更新时间",dataIndex:"update_time"},{
text:'',dataIndex:'caozuo',callback:'opegs{rand}'
}],
itemdblclick:function(){
......
webmain/flow/page/rock_page_assetm.php 0 → 100755
浏览文件 @ 9049fe3c
差异被折叠。
webmain/flow/page/rock_page_assetmbuy.php 0 → 100755
浏览文件 @ 9049fe3c
差异被折叠。
webmain/flow/page/rock_page_assetmoperate.php 0 → 100755
浏览文件 @ 9049fe3c
差异被折叠。
webmain/flow/page/rock_page_assetmuse.php 0 → 100755
浏览文件 @ 9049fe3c
差异被折叠。
webmain/flow/page/rock_page_cost_center.php
浏览文件 @ 9049fe3c
......@@ -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":"0","isalign":"0","islb":"1"},{"fields":"name","name":"\u540d\u79f0","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"principalid","name":"\u8d1f\u8d23\u4eba","fieldstype":"changeuser","ispx":"0","isalign":"0","islb":"1"},{"fields":"type","name":"\u7c7b\u578b","fieldstype":"select","ispx":"0","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":"0","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u751f\u6548\u65f6\u95f4","fieldstype":"text","ispx":"0","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":"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 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"},{text:"名称",dataIndex:"name"},{text:"负责人",dataIndex:"principalid"},{text:"类型",dataIndex:"type"},{text:"状态",dataIndex:"status",sortable:true},{text:"上级成本中心",dataIndex:"pid"},{text:"生效时间",dataIndex:"create_time"},{
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},{
text:'',dataIndex:'caozuo',callback:'opegs{rand}'
}],
itemdblclick:function(){
......
webmain/flow/page/rock_page_fund_deposit.php
浏览文件 @ 9049fe3c
......@@ -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":"0","isalign":"0","islb":"1"},{"fields":"toaccount","name":"\u8f6c\u5165\u8d26\u6237","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"1"},{"fields":"account","name":"\u8d44\u91d1\u6765\u6e90","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"trans_amount","name":"\u8f6c\u5165\u91d1\u989d","fieldstype":"number","ispx":"0","isalign":"0","islb":"1"},{"fields":"business_type","name":"\u4e1a\u52a1\u7c7b\u578b","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u521b\u5efa\u65f6\u95f4","fieldstype":"hidden","ispx":"0","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":"\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 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"},{text:"转入账户",dataIndex:"toaccount"},{text:"资金来源",dataIndex:"account"},{text:"转入金额",dataIndex:"trans_amount"},{text:"业务类型",dataIndex:"business_type"},{text:"创建时间",dataIndex:"create_time"},{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
浏览文件 @ 9049fe3c
......@@ -9,9 +9,9 @@ defined('HOST') or die ('not access');
<script>
$(document).ready(function(){
{params}
var modenum = 'fund_transfer',modename='资金划拨',isflow=0,modeid='116',atype = params.atype,pnum=params.pnum,modenames='';
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":"0","isalign":"0","islb":"1"},{"fields":"account","name":"\u8f6c\u51fa\u8d26\u6237","fieldstype":"selectdatafalse","ispx":"0","isalign":"0","islb":"1"},{"fields":"toaccount","name":"\u8f6c\u5165\u8d26\u6237","fieldstype":"selectdatafalse","ispx":"0","isalign":"0","islb":"1"},{"fields":"business_type","name":"\u5212\u62e8\u7c7b\u578b\t","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"1"},{"fields":"trans_amount","name":"\u8f6c\u51fa\u91d1\u989d","fieldstype":"number","ispx":"0","isalign":"0","islb":"1"},{"fields":"service_fee","name":"\u8d44\u91d1\u5229\u7387","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"account_balance","name":"\u8d26\u6237\u4f59\u989d","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u521b\u5efa\u65f6\u95f4","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"fund_rule","name":"\u8d44\u91d1\u89c4\u5219","fieldstype":"rockcombo","ispx":"0","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= [];
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 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"},{text:"转出账户",dataIndex:"account"},{text:"转入账户",dataIndex:"toaccount"},{text:"划拨类型 ",dataIndex:"business_type"},{text:"转出金额",dataIndex:"trans_amount"},{text:"资金利率",dataIndex:"service_fee"},{text:"账户余额",dataIndex:"account_balance"},{text:"创建时间",dataIndex:"create_time"},{text:"备注",dataIndex:"remark"},{
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(){
......@@ -255,9 +255,9 @@ $(document).ready(function(){
<tr>
<td style="padding-right:10px;" id="tdleft_{rand}" nowrap><button id="addbtn_{rand}" class="btn btn-primary" click="clickwin,0" disabled type="button"><i class="icon-plus"></i> 新增</button></td>
<td>
<input class="form-control" style="width:160px" id="key_{rand}" placeholder="关键字">
<input class="form-control" style="width:160px" id="key_{rand}" placeholder="关键字/申请人/单号">
</td>
<td style="padding-left:10px"><select class="form-control" style="width:120px" id="selstatus_{rand}"><option value="">-全部状态-</option><option style="color:blue" value="0">待处理</option><option style="color:green" value="1">已审核</option><option style="color:red" value="2">不同意</option><option style="color:#888888" value="5">已作废</option><option style="color:#17B2B7" value="23">退回</option></select></td>
<td style="padding-left:10px">
<div style="white-space:nowrap">
<button style="border-right:0;border-top-right-radius:0;border-bottom-right-radius:0" class="btn btn-default" click="searchbtn" type="button">搜索</button><button class="btn btn-default" id="downbtn_{rand}" type="button" style="padding-left:8px;padding-right:8px;border-top-left-radius:0;border-bottom-left-radius:0"><i class="icon-angle-down"></i></button>
......
webmain/flow/page/rock_page_goodly.php
浏览文件 @ 9049fe3c
......@@ -9,7 +9,7 @@ defined('HOST') or die ('not access');
<script>
$(document).ready(function(){
{params}
var modenum = 'goodly',modename='物品领用',isflow=1,modeid='24',atype = params.atype,pnum=params.pnum,modenames='领用物品';
var modenum = 'goodly',modename='物品领用',isflow=2,modeid='24',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":"applydt","name":"\u7533\u8bf7\u65e5\u671f","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"type","name":"\u7c7b\u578b","fieldstype":"fixed","ispx":"0","isalign":"0","islb":"0"},{"fields":"explain","name":"\u8bf4\u660e","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"1"},{"fields":"state","name":"\u51fa\u5e93\u72b6\u6001","fieldstype":"select","ispx":"1","isalign":"0","islb":"1"},{"fields":"wupinlist","name":"\u9886\u7528\u7684\u7269\u54c1","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"}],fieldsselarr= [];
......
webmain/flow/page/view_assetm_0.html 0 → 100755
浏览文件 @ 9049fe3c
<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="font-size:small;text-indent:28px;white-space:normal;">状态</span><br /></td><td class="ys2"><span style="font-size:small;text-indent:28px;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;">{laiyuan}</span><br /></td></tr><tr><td height="34" align="right" class="ys1"><span style="text-align:-webkit-right;white-space:normal;">使用人</span><br /></td><td class="ys2"><span style="white-space:normal;">{usename}</span> </td><td align="right" class="ys1"><span style="text-align:-webkit-right;white-space:normal;">使用人部门</span><br /></td><td class="ys2"><span style="white-space:normal;">{shuname}</span> </td></tr><tr><td height="34" width="15%" align="right" class="ys1">资产名称<br /></td><td width="35%" class="ys2">{title}</td><td width="15%" align="right" class="ys1"><span style="text-align:-webkit-right;white-space:normal;">价格</span> </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">{oanumb}</td></tr><tr><td height="34" align="right" class="ys1">使用人更迭记录</td><td class="ys2">{userchangerecord}</td><td align="right" class="ys1">最近使用人更迭日期</td><td class="ys2">{recentuserchangedate}</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="text-align:-webkit-right;white-space:normal;">型号</span> </td><td class="ys2" colspan="3"><span style="white-space:normal;">{model-xh}</span> </td></tr><tr><td class="ys1" style="text-align:right;">机器编号<br /></td><td class="ys1">{model-bh}<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}<br /></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_assetmbuy_0.html 0 → 100755
浏览文件 @ 9049fe3c
<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" colspan="3">{assetmtype}<br /></td></tr><tr><td class="ys1" style="text-align:center;background-color:#CCCCCC;">资产名称<br /></td><td class="ys2">{assetmname}<br /></td><td class="ys1" style="text-align:center;background-color:#CCCCCC;">申购数量<br /></td><td class="ys2">{assetmamount}<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 />
\ No newline at end of file
webmain/flow/page/view_assetmoperate_0.html 0 → 100755
浏览文件 @ 9049fe3c
<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;">操作动作</td><td class="ys2" colspan="3">{assetmoperatetype}<br /></td></tr><tr><td class="ys1" style="text-align:center;background-color:#CCCCCC;">资产名称<br /></td><td class="ys2">{assetmname}<br /></td><td class="ys1" style="text-align:center;background-color:#CCCCCC;">资产编号<br /></td><td class="ys2">{assetmnumb}<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 class="ys1" style="text-align:center;background-color:#CCCCCC;">资产价值<br /></td><td class="ys2">{assetmvalue}<br /></td><td class="ys1" style="text-align:center;background-color:#CCCCCC;">出售/维修价格<br /></td><td class="ys2">{price}<br /></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 />
\ No newline at end of file
webmain/flow/page/view_assetmselfequipped_0.html 0 → 100755
浏览文件 @ 9049fe3c
<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" colspan="3">{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;">{subsidyway}</span><br /></td></tr></tbody></table></p><br />
\ No newline at end of file
webmain/flow/page/view_assetmuse_0.html 0 → 100755
浏览文件 @ 9049fe3c
<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 />
\ No newline at end of file
webmain/model/1 0 → 100755
浏览文件 @ 9049fe3c
差异被折叠。
webmain/model/flow/finfybxModel.php
浏览文件 @ 9049fe3c
......@@ -47,6 +47,7 @@ class flow_finfybxClassModel extends flowModel
m('c_cbzx')->update($cbarr,"`code`='$cbzx'");
//账户明细 c_account_detail
$account_detail=array(
<<<<<<< HEAD
'account' => $data['name'],
'opt_type' => 2,
'amount' =>$this->rs['money'],
......@@ -57,6 +58,22 @@ class flow_finfybxClassModel extends flowModel
);
m('c_account_detail')->insert($account_detail);
// 业务付款8业务预付款10费用报销11 oa_c_fund_detail
=======
'account' => $data['name'],
'opt_type' => 2,
'amount' =>$this->rs['money'],
'trans_numb' => $this->rs['docnum'],
'account_balance' => $data['account_balance']-$this->rs['money'],
'create_time' =>date("Y-m-d H:i:s"),
'uid' =>$this->rs['uid'],
);
m('c_account_detail')->insert($account_detail);
// 业务付款8业务预付款10费用报销11 oa_c_fund_detail
>>>>>>> master
$fund_detail=array(
'trans_numb' =>$this->rs['docnum'],
'account' => $data['name'],
......@@ -69,6 +86,12 @@ class flow_finfybxClassModel extends flowModel
'uid' =>$this->rs['uid'],
);
m('c_fund_detail')->insert($fund_detail);
<<<<<<< HEAD
=======
>>>>>>> master
}
......
webmain/model/flow/fund_depositModel.php 100755 → 100644
浏览文件 @ 9049fe3c
File mode changed from 100755 to 100644
webmain/model/flow/fund_transferModel.php 100755 → 100644
浏览文件 @ 9049fe3c
File mode changed from 100755 to 100644
webmain/model/loginModel.php 100644 → 100755
浏览文件 @ 9049fe3c
......@@ -308,20 +308,35 @@ class loginClassModel extends Model
$redis->close();
$this->rock->clearcookie('mo_adminid,PHPSESSID,ukey');
<<<<<<< HEAD
$this->rock->clearsession('adminid,adminname,adminuser,user,ukey');
$this->rock->clearcookie('user','/',ini_get('session.cookie_domain'));
$this->rock->clearallcookie();
$this->rock->clearallsession();
=======
$this->rock->clearsession('adminid,adminname,adminuser,user,ukey');
$this->rock->clearcookie('user','/',ini_get('session.cookie_domain'));
$this->rock->clearallcookie();
$this->rock->clearallsession();
>>>>>>> master
$this->update("`online`=0", "`token`='$token'");
}
public function setsession($uid, $name,$token, $user='')
{
$encryptKey = $this->getRandomStr();
<<<<<<< HEAD
$isadmin = (int)$this->rock->session('isadmin');
$session = array(
=======
$session = array(
>>>>>>> master
'adminid' => $uid,
'adminname' => $name,
'adminuser' => $user,
......@@ -329,7 +344,11 @@ class loginClassModel extends Model
'logintime' => time(),
'ukey' => $encryptKey
);
<<<<<<< HEAD
if($user == 'admin' || $isadmin) $session['is_admin'] = true;
=======
if($user == 'admin') $session['is_admin'] = true;
>>>>>>> master
else $session['is_admin'] = false;
$this->rock->savesession($session);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论