daxi20/xinhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发布v2.5.6版本

Browse Source
This commit is contained in:
雨中磐石
2023-04-26 15:46:53 +08:00
parent 33ce4c6298
commit 8145b2df84
55 changed files with 1193 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webmain/main/flow/flowAction.php
View File

@@ -803,6 +803,18 @@ class mode_'.$modenum.'ClassAction extends inputAction{
if($flow->isflow>0){
$billrs = $flow->billmodel->getone("`table`='$flow->mtable' and `mid`='".$rs['id']."'");
$otehsr = arrvalue($billrs, 'nowcheckname');
$narr['udeptname'] = arrvalue($billrs, 'udeptname');
$narr['optname'] = arrvalue($billrs, 'uname');
}else{
$uid = arrvalue($rs,'uid');
if(!$uid)$uid = arrvalue($rs,'optid');
if($uid){
$urs = $flow->adminmodel->getXinxi($uid);
if($urs){
$narr['udeptname'] = $urs['deptname'];
$narr['optname'] = $urs['name'];
}
}
}
$narr['status'] = $flow->getstatus($rs,'',$otehsr,1);
$narr['chushu'] = $flow->flogmodel->rows("`table`='".$flow->mtable."' and `mid`='".$rs['id']."'");
@@ -1168,8 +1180,12 @@ class mode_'.$modenum.'ClassAction extends inputAction{
$num = $this->post('num');
$modeid = (int)$this->post('modeid');
$str = $this->post('str');
$this->option->setval($num.'@'.(-1*$modeid-1000), $str,'模块列定义');
$path = m('mode')->createlistpage($modeid);
if($str){
$this->option->setval($num.'@'.(-1*$modeid-1000), $str,'模块列定义');
}else{
$this->option->delete("`num`='$num'");
}
//$path = m('mode')->createlistpage($modeid);
$msg = 'ok';
//if($path=='')$msg='已保存,但无法从新生成列表页,自定义列将不能生效';
echo $msg;

2
webmain/main/flow/rock_flow_elementedit.php
View File

@@ -16,7 +16,7 @@ $(document).ready(function(){
},
submitcheck:function(d){
if(d.fieldstype.indexOf('change')==0){
if(d.data=='')return '此字段元素类型时，数据源必须填写用来存储选择来的Id，如填写为：'+d.fields+'id';
if(d.data=='' || d.data==d.fields)return '此字段元素类型时，数据源必须填写用来存储选择来的Id，请填写为：'+d.fields+'id';
}
if(d.islu=='1' && d.fields=='id')return 'id字段是不可以做录入项字段';
}

14
webmain/main/flow/rock_flow_menuedit.php
View File

@@ -37,6 +37,18 @@ $(document).ready(function(){
h.setValue('upgcont',jm.base64decode(d.upgcont));
}
}
var c = {
xuanrenyua:function(){
js.changeuser('', 'usercheck', '选择适用人员',{
onselect:function(sna,sid){
if(sid)h.form.wherestr.value+=' and {uid} in('+sid+')';
}
})
}
}
js.initbtn(c);
});
</script>
@@ -110,7 +122,7 @@ $(document).ready(function(){
<tr>
<td align="right">条件：</td>
<td class="tdinput" colspan="3"><textarea name="wherestr" style="height:60px" class="form-control"></textarea><font color=#888888>为空或者条件满足时显示菜单</font></td>
<td class="tdinput" colspan="3"><textarea name="wherestr" style="height:60px" class="form-control"></textarea><font color=#888888>为空或者条件满足时显示菜单</font>&nbsp;<button click="xuanrenyua" class="btn btn-default btn-xs" type="button">选适用人员</button></td>
</tr>
<tr>

4
webmain/main/flow/rock_flow_setedit.php
View File

@@ -205,13 +205,13 @@ cont:
<td class="tdinput" colspan="3">
<label><input name="isgbjl" value="1" type="checkbox"> 不显示操作记录</label>&nbsp; &nbsp;
<label><input name="isgbcy" value="1" type="checkbox"> 不显示查阅记录</label>&nbsp;
<label><input name="isscl" value="1" checked type="checkbox"> 标识已生成列表页</label>&nbsp;
<label><input name="ispl" value="1" type="checkbox"> 开启可评论</label>
&nbsp;
<label><input name="istxset" value="1" type="checkbox"> 开启单据提醒设置</label>
&nbsp;
<label><input name="ishz" value="1" type="checkbox"> 开启回执确认</label>&nbsp;
<label><input name="isys" value="1" type="checkbox"> 开启流程加签</label>
<label><input name="isys" value="1" type="checkbox"> 开启流程加签</label>&nbsp;
标识已生成列表页<select name="isscl"><option value="0">未生成</option><option value="1">已生成</option><option value="2">已生成2</option></select></label>
</td>
</tr>

2
webmain/main/flow/rock_flow_view.php
View File

@@ -8,6 +8,8 @@ $(document).ready(function(){
tablename:'flow_set',celleditor:true,fanye:true,params:{modeid:0},autoLoad:false,dir:'desc',sort:'id',statuschange:false,
url:publicstore('{mode}','{dir}'),storebeforeaction:'viewshowbefore',storeafteraction:'viewshowafter',
columns:[{
text:'申请人部门',dataIndex:'udeptname'
},{
text:'操作人',dataIndex:'optname',sortable:true
},{
text:'摘要',dataIndex:'summary',align:'left'

18
webmain/main/fwork/fworkAction.php
View File

@@ -30,7 +30,7 @@ class fworkClassAction extends Action
$mid = '0';
foreach($rows as $k=>$rs){
$path = ''.P.'/flow/page/rock_page_'.$rs['num'].'.php';
if(!file_exists($path) || $rs['isscl']==0)continue;
if((!file_exists($path) && $rs['isscl']==1) || $rs['isscl']==0)continue;
$lx = $rs['type'];
$mid.=','.$rs['id'].'';
$row[$lx][] = $rs;
@@ -44,9 +44,13 @@ class fworkClassAction extends Action
if(!isset($atypea[$nus]))$atypea[$nus] = $rs1['num'];
}
foreach($row as $lx=>$rowaa){
$nrowa = array();
foreach($rowaa as $k2=>$rs2){
$row[$lx][$k2]['atype'] = $this->rock->arrvalue($atypea, $rs2['id']);
$atype = $this->rock->arrvalue($atypea, $rs2['id']);
$row[$lx][$k2]['atype'] = $atype;
if($atype)$nrowa[] = $row[$lx][$k2];
}
$row[$lx] = $nrowa;
}
}
$this->returnjson(array('rows'=>$row));
@@ -325,9 +329,15 @@ class fworkClassAction extends Action
public function deltodoAjax()
{
$id = $this->post('id','0');
$id = c('check')->onlynumber($this->post('id','0'));
m('flow_todos')->delete('id in('.$id.') and `uid`='.$this->adminid.'');
$this->backmsg();
}
public function deltodoydAjax()
{
$id = c('check')->onlynumber($this->post('id','0'));
m('flow_todos')->update('`readdt`=now(),`isread`=1','id in('.$id.') and `uid`='.$this->adminid.' and `isread`=0');
return returnsuccess();
}
}

8
webmain/main/fwork/rock_fwork_search.php
View File

@@ -12,7 +12,7 @@ $(document).ready(function(){
s1 ='<div align="left" style="margin:20px;width:230px" class="list-group">';
s1+='<div class="list-group-item list-group-item-success"><i class="icon-star-empty"></i> '+lx+'('+len+')</div>';
for(i=0;i<len;i++){
s1+='<a style="TEXT-DECORATION:none" onclick="opencoluske_{rand}(\''+d[i].name+'\',\''+d[i].num+'\',\''+d[i].atype+'\')" class="list-group-item">'+d[i].name+'</a>';
s1+='<a style="TEXT-DECORATION:none" onclick="opencoluske_{rand}(\''+d[i].name+'\',\''+d[i].num+'\',\''+d[i].atype+'\','+d[i].isscl+')" class="list-group-item">'+d[i].name+'</a>';
}
s1+='</div>';
strarr[l]+=s1;
@@ -26,9 +26,11 @@ $(document).ready(function(){
}
}
opencoluske_{rand}=function(na,num,ats){
opencoluske_{rand}=function(na,num,ats,scl){
if(!ats)ats='my';
addtabs({name:na,num:'search'+num+'',url:'flow,page,'+num+',atype='+ats+'',icons:'search'});
var str = num;
if(scl=='2')str='aas,bh='+num+'';
addtabs({name:na,num:'search'+num+'',url:'flow,page,'+str+',atype='+ats+'',icons:'search'});
}
js.ajax(js.getajaxurl('getmodesearcharr','{mode}','{dir}'),{},function(a){

13
webmain/main/fwork/rock_fwork_todo.php
View File

@@ -74,6 +74,17 @@ $(document).ready(function(){
},
del:function(){
a.del({checked:true,url:js.getajaxurl('deltodo','{mode}','{dir}')});
},
searchyidu:function(){
var sid = a.getchecked();
if(!sid){
js.msg('msg','没有选中行记录');
return;
}
js.ajax(js.getajaxurl('deltodoyd','{mode}','{dir}'),{id:sid},function(){
a.reload();
});
}
};
js.initbtn(c);
@@ -112,7 +123,7 @@ $(document).ready(function(){
<button class="btn btn-default" click="search" type="button">搜索</button>
</td>
<td width="80%" style="padding-left:10px">
<button class="btn btn-default" click="searchyidu" type="button">全部标识已读</button>
</td>

3
webmain/main/userinfo/userinfoAction.php
View File

@@ -91,6 +91,9 @@ class userinfoClassAction extends Action
);
$atatea = explode(',', '试用期,正式,实习生,兼职,临时工,离职');
$atrows = $this->option->getmnum('userstate');
foreach($atrows as $k1=>$rs1)if(!isempt($rs1['value']))$atatea[$rs1['value']] = $rs1['name'];
foreach($rows as $k=>$rs){
$year = '';
if(!$this->isempt($rs['workdate'])) $year = substr($rs['workdate'],0,4);