Skip to content

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

update

上级 8907a146
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 66 行增加 和 13 行删除
config/config.php
浏览文件 @ 11af9747
......@@ -12,7 +12,7 @@ ini_set('session.save_handler', 'redis');
ini_set('session.save_path', 'tcp://192.168.1.222:6379');
ini_set('session.cookie_path', '/');
ini_set('session.cookie_domain', 'gonn.com.cn');
ini_set('session.cookie_lifetime', '1800');
ini_set('session.cookie_lifetime', '7200');
@session_start();
if(function_exists('date_default_timezone_set'))date_default_timezone_set('Asia/Shanghai'); //设置默认时区
......
custmoer.txt
浏览文件 @ 11af9747
......@@ -25,3 +25,12 @@
客户名称：易电务（北京）科技有限公司保存接口失败 客户编号：CUST24050保存接口成功 执行时间：1.4224369525909 s
客户编号：CUST24050提交接口成功 执行时间：0.11602902412415 s
客户编号：CUST24050审核接口成功 执行时间：0.18425989151001 s
客户编号：CUST24051保存接口成功 执行时间：2.1835269927979 s
客户编号：CUST24051提交接口成功 执行时间：0.084365844726562 s
客户编号：CUST24051审核接口成功 执行时间：0.15912199020386 s
客户编号：CUST24052保存接口成功 执行时间：4.1266798973083 s
客户编号：CUST24052提交接口成功 执行时间：0.37966990470886 s
客户编号：CUST24052审核接口成功 执行时间：0.15844106674194 s
客户编号：CUST24053保存接口成功 执行时间：4.3511328697205 s
客户编号：CUST24053提交接口成功 执行时间：0.45927286148071 s
客户编号：CUST24053审核接口成功 执行时间：0.14415597915649 s
supplier.txt
浏览文件 @ 11af9747
......@@ -119,4 +119,21 @@
供应商编号：VEN04996保存接口成功 执行时间：0.3246431350708 s
供应商编号：VEN04996提交接口成功 执行时间：0.059867143630981 s
供应商编号：VEN04996审核接口成功 执行时间：0.097572088241577 s
供应商名称：北京敬美定建材经营部保存接口失败
\ No newline at end of file
供应商名称：北京敬美定建材经营部保存接口失败 供应商名称：北京海科之园园林绿化有限公司保存接口失败 供应商编号：VEN04999保存接口成功 执行时间：0.35171103477478 s
供应商编号：VEN04999提交接口成功 执行时间：1.264858007431 s
供应商编号：VEN04999审核接口成功 执行时间：0.16371202468872 s
供应商名称：北京盘天地信息技术有限公司保存接口失败 供应商名称：北京英创嘉友知识产权代理事务所保存接口失败 解析字段(Key:注册资金(万元),name:FRegisterFund)时发生异常,异常信息:解析字段(Key:注册资金(万元),name:FRegisterFund)时发生异常,异常信息:输入字符串的格式不正确。 在 Kingdee.BOS.WebApi.FormService.MapPropertyService.MapComplexProperty(String pkProperty, Dictionary`2 sourceObj, DynamicObject targetObj, Int32 rowIndex, HashSet`1 NeedUpDateFields)
在 Kingdee.BOS.WebApi.FormService.Save.Revole()
在 Kingdee.BOS.WebApi.FormService.Save.Execute()
在 Kingdee.BOS.WebApi.FormService.BillOperationService.ExecuteOperation(FormOperation op, String data)供应商编号：VEN05001保存接口成功 执行时间：3.0436930656433 s
供应商编号：VEN05001提交接口成功 执行时间：1.258975982666 s
供应商编号：VEN05001审核接口成功 执行时间：0.17937803268433 s
供应商名称：北京万航博通科技有限公司保存接口失败 供应商编号：VEN05003保存接口成功 执行时间：0.34562993049622 s
供应商编号：VEN05003提交接口成功 执行时间：1.2431640625 s
供应商编号：VEN05003审核接口成功 执行时间：0.23087501525879 s
供应商编号：VEN05004保存接口成功 执行时间：0.31795811653137 s
供应商编号：VEN05004提交接口成功 执行时间：0.062644004821777 s
供应商编号：VEN05004审核接口成功 执行时间：0.10247111320496 s
供应商名称：中铁六局集团电务工程有限公司保存接口失败 供应商编号：VEN05006保存接口成功 执行时间：1.6346430778503 s
供应商编号：VEN05006提交接口成功 执行时间：1.1099901199341 s
供应商编号：VEN05006审核接口成功 执行时间：0.17360591888428 s
webmain/flow/input/inputAction.php 100755 → 100644
浏览文件 @ 11af9747
......@@ -17,6 +17,9 @@ class inputAction extends Action
private $fieldarr = array();
private $ismobile = 0;
private $subdata = []; //子表数据
private $maindata = [];
protected $moders = array();
......@@ -188,6 +191,9 @@ class inputAction extends Action
//判断保存前的
$ss = '';
$befa = $this->savebefore($table, $this->getsavenarr($uaarr, $oldrs), $id, $addbo);
$this->maindata = $this->getsavenarr($uaarr, $oldrs); //缓存主表数据
$notsave= array();//不保存的字段
if(is_string($befa)){
$ss = $befa;
......@@ -247,8 +253,10 @@ class inputAction extends Action
//保存后处理
$this->saveafter($table,$this->getsavenarr($uaarr, $oldrs), $id, $addbo);
//保存修改记录
$this->record($id); //保存日志
//保存修改记录
$editcont = '';
if($oldrs){
$newrs = $db->getone($id);
......@@ -258,9 +266,19 @@ class inputAction extends Action
$this->flow->editcont = $editcont;
$this->flow->loaddata($id, false);
$this->flow->submit($subna);
$this->backmsg('', $subna, $id);
$this->backmsg('', $subna, $id);
}
private function record($id){
$type = empty($id) ? '插入数据' : '修改数据';
$data['main'] = $this->maindata;
$data['sub'] = $this->subdata;
$data = json_encode($data);
m('log')->addlog($type,$data,[]);
}
private function getsavenarr($nsrr, $bos=false)
{
......@@ -315,7 +333,9 @@ class inputAction extends Action
$idss = '0';
$whes = '';
$allfields = $this->db->getallfields('[Q]'.$tables.'');
$this->subdata[$tables] = $data; //缓存子表数据
$allfields = $this->db->getallfields('[Q]'.$tables.'');
$oarray = array();
if(in_array('optdt', $allfields))$oarray['optdt'] = $this->now;
if(in_array('optid', $allfields))$oarray['optid'] = $this->adminid;
......@@ -336,7 +356,6 @@ class inputAction extends Action
$uaarr['mid'] = $mid;
if($sid==0)$where = '';
foreach($oarray as $k1=>$v1)$uaarr[$k1]=$v1;
$dbs->record($uaarr, $where);
if($sid==0)$sid = $this->db->insert_id();
$idss.=','.$sid.'';
......
webmain/flow/input/inputAction.php.bak 0 → 100755
浏览文件 @ 11af9747
差异被折叠。
webmain/flow/page/rock_page_hisoa.php
浏览文件 @ 11af9747
......@@ -11,7 +11,7 @@ $(document).ready(function(){
{params}
var modenum = 'hisoa',modename='历史OA信息展示',isflow=0,modeid='112',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":"his_oa_numb","name":"\u5386\u53f2OA\u6d41\u6c34\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"payment_type","name":"\u4ed8\u6b3e\u7c7b\u578b","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"project_name","name":"\u9879\u76ee\u540d\u79f0","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"amount","name":"\u4ed8\u6b3e\u91d1\u989d","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"payee","name":"\u6536\u6b3e\u4eba","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"payment_mode","name":"\u4ed8\u6b3e\u65b9\u5f0f","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"applicant","name":"\u7533\u8bf7\u4eba","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"department","name":"\u6240\u5c5e\u90e8\u95e8","fieldstype":"changedept","ispx":"0","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u7533\u8bf7\u65f6\u95f4","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"final_status","name":"\u6700\u7ec8\u72b6\u6001","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"contract","name":"\u6240\u5c5e\u5408\u540c\u7f16\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"pay_explain","name":"\u4ed8\u6b3e\u8bf4\u660e","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"1"},{"fields":"project_numb","name":"\u76f8\u5173\u9879\u76ee\u7f16\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"his_dept","name":"\u5386\u53f2\u5f52\u5c5e\u90e8\u95e8","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":"his_oa_numb","name":"\u5386\u53f2OA\u6d41\u6c34\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"payment_type","name":"\u4ed8\u6b3e\u7c7b\u578b","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"project_name","name":"\u9879\u76ee\u540d\u79f0","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"amount","name":"\u4ed8\u6b3e\u91d1\u989d","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"payee","name":"\u6536\u6b3e\u4eba","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"uid","name":"\u5458\u5de5ID","fieldstype":"number","ispx":"0","isalign":"0","islb":"0"},{"fields":"payment_mode","name":"\u4ed8\u6b3e\u65b9\u5f0f","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"applicant","name":"\u7533\u8bf7\u4eba","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"department","name":"\u6240\u5c5e\u90e8\u95e8","fieldstype":"changedept","ispx":"0","isalign":"0","islb":"1"},{"fields":"create_time","name":"\u7533\u8bf7\u65f6\u95f4","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"final_status","name":"\u6700\u7ec8\u72b6\u6001","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"contract","name":"\u6240\u5c5e\u5408\u540c\u7f16\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"pay_explain","name":"\u4ed8\u6b3e\u8bf4\u660e","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"1"},{"fields":"project_numb","name":"\u76f8\u5173\u9879\u76ee\u7f16\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"his_dept","name":"\u5386\u53f2\u5f52\u5c5e\u90e8\u95e8","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"}],fieldsselarr= [];
var c = {
reload:function(){
......
webmain/flow/page/rock_page_oayfk.php
浏览文件 @ 11af9747
......@@ -11,7 +11,7 @@ $(document).ready(function(){
{params}
var modenum = 'oayfk',modename='预付款申请单',isflow=1,modeid='103',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":"fkinfo","name":"\u6536\u6b3e\u4eba\u4fe1\u606f","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"0"},{"fields":"userid","name":"\u7528\u6237\u7f16\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"0"},{"fields":"paymentMethod","name":"\u4ed8\u6b3e\u65b9\u5f0f","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"0"},{"fields":"payee","name":"\u6536\u6b3e\u65b9","fieldstype":"selectdatafalse","ispx":"1","isalign":"0","islb":"0"},{"fields":"paymentBy","name":"\u4ed8\u6b3e\u4e8b\u7531","fieldstype":"textarea","ispx":"1","isalign":"0","islb":"0"},{"fields":"fkorg","name":"\u4ed8\u6b3e\u7ec4\u7ec7","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"0"},{"fields":"applicant","name":"\u7533\u8bf7\u4eba","fieldstype":"text","ispx":"0","isalign":"0","islb":"0"},{"fields":"application","name":"\u7533\u8bf7\u90e8\u95e8","fieldstype":"text","ispx":"0","isalign":"0","islb":"0"},{"fields":"fujian","name":"\u9644\u4ef6","fieldstype":"uploadfile","ispx":"0","isalign":"0","islb":"0"},{"fields":"applydate","name":"\u7533\u8bf7\u65e5\u671f","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"docnum","name":"\u5355\u636e\u7f16\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"yfkname","name":"\u6807\u9898","fieldstype":"text","ispx":"0","isalign":"0","islb":"1"},{"fields":"amountOfThisPayment","name":"\u4ed8\u6b3e\u91d1\u989d","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"}],fieldsselarr= {"columns_oayfk_all":"base_name,base_deptname,applydate,docnum,yfkname,amountOfThisPayment,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":"fkinfo","name":"\u6536\u6b3e\u4eba\u4fe1\u606f","fieldstype":"textarea","ispx":"0","isalign":"0","islb":"0"},{"fields":"userid","name":"\u7528\u6237\u7f16\u53f7","fieldstype":"text","ispx":"0","isalign":"0","islb":"0"},{"fields":"paymentMethod","name":"\u4ed8\u6b3e\u65b9\u5f0f","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"0"},{"fields":"payee","name":"\u6536\u6b3e\u65b9","fieldstype":"selectdatafalse","ispx":"1","isalign":"0","islb":"0"},{"fields":"paymentBy","name":"\u4ed8\u6b3e\u4e8b\u7531","fieldstype":"textarea","ispx":"1","isalign":"0","islb":"0"},{"fields":"fkorg","name":"\u4ed8\u6b3e\u7ec4\u7ec7","fieldstype":"rockcombo","ispx":"0","isalign":"0","islb":"0"},{"fields":"applicant","name":"\u7533\u8bf7\u4eba","fieldstype":"text","ispx":"0","isalign":"0","islb":"0"},{"fields":"application","name":"\u7533\u8bf7\u90e8\u95e8","fieldstype":"text","ispx":"0","isalign":"0","islb":"0"},{"fields":"fujian","name":"\u9644\u4ef6","fieldstype":"uploadfile","ispx":"0","isalign":"0","islb":"0"},{"fields":"applydate","name":"\u7533\u8bf7\u65e5\u671f","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"docnum","name":"\u5355\u636e\u7f16\u53f7","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"yfkname","name":"\u6807\u9898","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"},{"fields":"amountOfThisPayment","name":"\u4ed8\u6b3e\u91d1\u989d","fieldstype":"text","ispx":"1","isalign":"0","islb":"1"}],fieldsselarr= {"columns_oayfk_all":"base_name,base_deptname,applydate,docnum,yfkname,amountOfThisPayment,caozuo"};
var c = {
reload:function(){
......@@ -210,7 +210,7 @@ $(document).ready(function(){
fanye:true,modenum:modenum,modename:modename,statuschange:false,tablename:jm.base64decode('Y19maW5pbmZvbV9vYXlmaw::'),
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:"applydate"},{text:"单据编号",dataIndex:"docnum"},{text:"标题",dataIndex:"yfkname"},{text:"付款金额",dataIndex:"amountOfThisPayment",sortable:true},{text:"状态",dataIndex:"statustext"},{
columns:[{text:"申请人",dataIndex:"base_name",sortable:true},{text:"申请人部门",dataIndex:"base_deptname",sortable:true},{text:"单号",dataIndex:"sericnum"},{text:"申请日期",dataIndex:"applydate",sortable:true},{text:"单据编号",dataIndex:"docnum",sortable:true},{text:"标题",dataIndex:"yfkname",sortable:true},{text:"付款金额",dataIndex:"amountOfThisPayment",sortable:true},{text:"状态",dataIndex:"statustext"},{
text:'',dataIndex:'caozuo',callback:'opegs{rand}'
}],
itemdblclick:function(){
......
webmain/model/flow/flow.php 100755 → 100644
浏览文件 @ 11af9747
......@@ -2267,8 +2267,17 @@ sssss;
$this->rs['now_adminname'] = $this->adminname;
$this->rs['now_modename'] = $modename;
$cont = $this->rock->reparr($cont, $this->rs);
$contt = strip_tags($cont);
#var_dump($contt);
$date = date("Y/m/d H:i:s");
if(strpos($contt,'北京广厦网络技术股份公司 GONN Network Technology Inc OA系统提示，') !== false){
$contt=str_replace('北京广厦网络技术股份公司 GONN Network Technology Inc OA系统提示，','',$contt);
$contt=str_replace('链 接：>>> 更多信息请登录 广厦网络OA办公系统 进行查看，感谢您的使用和支持。 通过邮件或电话(010-62419724转829)联系我们，获得更多帮助。 OA办公系统本邮件由系统自动发出，请勿直接回复 ','',$contt);
$contt=str_replace('更多信息请登录 广厦网络OA办公系统 进行查看，感谢您的使用和支持。 通过邮件或电话(010-62419724转829)联系我们，获得更多帮助。 OA办公系统本邮件由系统自动发出，请勿直接回复 ','',$contt);
}
$receid = $this->adminmodel->gjoins($receid);
$uids = m('todo')->addtodo($receid, $modename, $cont, $modenum, $id);
$uids = m('todo')->addtodo($receid, $modename, $contt, $modenum, $id);
if($uids!='' && $moders['type'] != '系统' && $id > 0)$this->todosmodel->addtotouids($uids, array(
'table' => $this->mtable,
'mid' => $id,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论