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

发布v2.6.8版本

Browse Source
This commit is contained in:
雨中磐石
2025-03-31 20:54:32 +08:00
parent 0701e2a8b4
commit d41bd27082
122 changed files with 9827 additions and 9132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -720,7 +720,7 @@ class mode_'.$modenum.'ClassAction extends inputAction{
$tablesn = explode(',', $mrs['names']);
foreach($tablesa as $k=>$tab){
$str = m('input')->getsubtable($modeid, $k+1, 1);
$s.='<tr ><td class="ys2" style="background-color:#CCCCCC;" colspan="4"><strong>'.arrvalue($tablesn, $k).'</strong></td></tr>';
$s.='<tr ><td class="ys2 zbtitle" colspan="4"><strong>'.arrvalue($tablesn, $k).'</strong></td></tr>';
$s.='<tr><td class="ys0" colspan="4">'.$str.'</td></tr>';
}
}
@@ -808,7 +808,7 @@ class mode_'.$modenum.'ClassAction extends inputAction{
$narr['modename'] = $this->moders['name'];
$narr['table'] = $this->moders['table'];
$narr['optdt'] = arrvalue($rs,'optdt');
$nors = $flow->flowrsreplace($rs, 2);
$nors = $flow->rsreplace($rs, 2, null, 1);
$narr['summary'] = $this->rock->reparr($this->moders['summary'], $nors);
$otehsr = '';
if($flow->isflow>0){
@@ -911,7 +911,7 @@ class mode_'.$modenum.'ClassAction extends inputAction{
$fiesss = substr($fields,0,5);
if($fiesss == 'base_' || $fiesss == 'temp_')return;
if(!isempt($tables) && $cans['islu']==1){
$_fieldsa = $this->db->gettablefields('[Q]'.$tables.'');$allfields = array();
$_fieldsa = $this->db->gettablefields('[Q]'.$tables.'');$allfields = array();$this->rock->debugs($_fieldsa,'fields');
foreach($_fieldsa as $k2=>$rs2)$allfields[$rs2['name']] = $rs2;
$this->createfields($allfields, $tables, $fields, $type, $lens, $dev, $name);
if(substr($type,0,6)=='change' && !isempt($data)){
@@ -1087,7 +1087,7 @@ class mode_'.$modenum.'ClassAction extends inputAction{
m('log')->addlog('模块','清空模块['.$name.']的数据');
}
$this->db->query("alter table `[Q]$table` AUTO_INCREMENT=1");
//$this->db->query("alter table `[Q]$table` AUTO_INCREMENT=1");
return 'ok';
}
@@ -1645,4 +1645,13 @@ return array(
}
return $arr;
}
public function opentixingAjax()
{
$fields = $this->get('fields');
if(c('check')->onlynumber($fields))return '错误';
$value = (int)$this->get('value');
m('flow_set')->update("`$fields`='$value'", 'id>0');
return '处理成功';
}
}

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

@@ -138,11 +138,11 @@ $(document).ready(function(){
<tr id="changefields{rand}" style="display:none">
<td align="right" nowrap >变化字段(可多选)：<br><font color="#888888">来自[表单元素管理]</font><font color=white>：</font></td>
<td class="tdinput"><select multiple name="changefields" size="8" class="form-control"></select></td>
<td class="tdinput"><select multiple style="height:100px;overflow:auto" name="changefields" size="8" class="form-control"></select></td>
</tr>
<tr id="changecourse{rand}" style="display:none">
<td align="right" nowrap >处理的步骤(可多选)：<br><font color="#888888">来自[流程审核步骤]</font><font color=white>：</font></td>
<td class="tdinput"><select multiple name="changecourse" size="5" class="form-control"></select></td>
<td class="tdinput"><select multiple style="height:100px;overflow:auto" name="changecourse" size="5" class="form-control"></select></td>
</tr>
<tr>

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

@@ -46,6 +46,10 @@ $(document).ready(function(){
modeid=v;
a.setparams({modeid:v},true);
},
changemodes:function(v){
modeid=v;
a.setparams({modeid:v},true);
},
del:function(){
a.del({
url:js.getajaxurl('delmodeshuju','{mode}','{dir}'),
@@ -59,24 +63,13 @@ $(document).ready(function(){
openviewlog:function(id){
var d = a.getData(id);
addtabs({name:'['+d.id+'.'+d.modename+']操作记录','num':''+d.modenum+''+d.id+'',url:'main,flow,viewlog,modenum='+d.table+',mid='+d.id+''});
},
xuanmode:function(o1){
js.selectmode(o1, get('modes_{rand}'), function(sna,val,d){
c.changemodes(val);
});
}
};
$('#mode_{rand}').change(c.changemode);
$.get(js.getajaxurl('getmodearr','{mode}','{dir}'),function(str){
var d=js.decode(str);
var s = '<option value="0">-选择模块-</option>',len=d.data.length,i,csd,types='';
for(i=0;i<len;i++){
csd = d.data[i];
if(types!=csd.type){
if(types!='')s+='</optgroup>';
s+='<optgroup label="'+csd.type+'">';
}
s+='<option value="'+csd.id+'">'+csd.name+'</option>';
types = csd.type;
}
$('#mode_{rand}').html(s);
});
js.initbtn(c);
openlogs{rand}=function(id){
c.openviewlog(id);
@@ -88,7 +81,10 @@ $(document).ready(function(){
<table width="100%">
<tr>
<td align="left">
<select style="width:180px" id="mode_{rand}" class="form-control" ><option value="0">-选择模块-</option></select>
<div class="btn-group" style="width:260px;" click="xuanmode">
<input class="input" placeholder="-选择模块-" style="flex:1" id="modes_{rand}" readonly>
<button class="webbtn webbtn-default">v</button>
</div>
</td>
<td align="left" style="padding:0px 10px;">

5
webmain/main/flow/tpl_flow_input.html
View File

@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title><?=$da['title']?>-<?=TITLE?></title>
<link rel="stylesheet" href="webmain/css/css.css" />
<link rel="stylesheet" href="webmain/css/rock.css?<?=time()?>" />
<link rel="stylesheet" href="mode/kindeditor/themes/default/default.css" />
<link rel="shortcut icon" href="favicon.ico" />
<script type="text/javascript" src="js/jquery.js"></script>
@@ -139,6 +139,9 @@ select{font-size:12px}
#page_left div{text-align:left;padding:5px 10px;cursor:pointer}
#page_left div:hover{ background-color:#f1f1f1;color:#225DE8}
</style>
<?php
echo c('color')->getApptheme(false);
?>
</head>
<body>
<div align="center">

5
webmain/main/flow/tpl_flow_inputzs.html
View File

@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title><?=$da['title']?>-<?=TITLE?></title>
<link rel="stylesheet" href="webmain/css/css.css" />
<link rel="stylesheet" href="webmain/css/rock.css?<?=time()?>" />
<link rel="stylesheet" href="mode/kindeditor/themes/default/default.css" />
<link rel="shortcut icon" href="favicon.ico" />
<script type="text/javascript" src="js/jquery.js"></script>
@@ -115,6 +115,9 @@ select{font-size:12px}
#page_left div{text-align:left;padding:5px 10px;cursor:pointer}
#page_left div:hover{ background-color:#f1f1f1;color:#225DE8}
</style>
<?php
echo c('color')->getApptheme(false);
?>
</head>
<body>
<div align="center">

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

@@ -283,7 +283,7 @@ class fworkClassAction extends Action
if($enddt=='')$enddt = $dtobj->adddate($startdt,'d',7);
$jg = $dtobj->datediff('d',$startdt, $enddt);
if($jg>30)$jg = 30;
$flow = m('flow:meet');
$flow = m('flow')->initflow('meet');
$data = m('meet')->getall("`status`=1 and `type`=0 and `startdt`<='$enddt 23:59:59' and `enddt`>='$startdt' order by `startdt` asc",'hyname,title,startdt,enddt,state,joinname,optname,id');
$datss = array();
foreach($data as $k=>$rs){
@@ -297,8 +297,21 @@ class fworkClassAction extends Action
$columns = $rows;
$barr = array();
$dt = $startdt;
$gdrows = $flow->getall('`type`=1 and `status`=1');
for($i=0; $i<=$jg; $i++){
if($i>0)$dt = $dtobj->adddate($dt,'d',1);
//固定会议
if($gdrows && $dt > $this->rock->date){
$srows = $flow->createmeet($gdrows, $dt, true);
if($srows)foreach($srows as $k1=>$rs){
$key = substr($rs['startdt'],0,10).$rs['hyname'];
if(!isset($datss[$key]))$datss[$key] = array();
$str = '['.substr($rs['startdt'],11,5).'→'.substr($rs['enddt'],11,5).']'.$rs['title'].'('.$rs['joinname'].') <font color=blue>固定会议</font>';
$datss[$key][] = $str;
}
}
$w = $dtobj->cnweek($dt);
$status = 1;
if($w=='六'||$w=='日')$status = 0;

2
webmain/main/goods/rock_goods_pandian.php
View File

@@ -80,7 +80,7 @@ $(document).ready(function(){
js.initbtn(c);
$('#optionview_{rand}').css('height',''+(viewheight-25)+'px');
$('#optionview_{rand}').css('height',''+(viewheight-45)+'px');
});
</script>

8
webmain/main/kaoqin/kaoqinAction.php
View File

@@ -22,15 +22,15 @@ class kaoqinClassAction extends Action
$dt1 = $this->post('dt1');
$dt2 = $this->post('dt2');
$msg = '获取成功';
$daka = $this->option->getval('qywxplat_daka');
$daka = $this->option->getval('wxqyplat_daka');
if($daka=='1'){
$barr = c('rockqywx')->getcheckindata($uids, $dt1, $dt2, 1);
$barr = c('rockwxqy')->getcheckindata($uids, $dt1, $dt2, 1);
if(!$barr['success']){
$msg = $barr['msg'];
}else{
$data = $barr['data'];
$msg .= ',从代建中应用获取打卡(共'.$data['zongts'].'条,新增'.$data['okload'].'条)';
if($data['maxpage']>1)$msg.=',并发送异步请求1条';
//$msg .= ',从代建中应用获取打卡(共'.$data['zongts'].'条,新增'.$data['okload'].'条)';
//if($data['maxpage']>1)$msg.=',并发送异步请求1条';
}
}else{
if($reimbo->installwx(1)){

30
webmain/main/view/rock_view.php
View File

@@ -33,22 +33,6 @@ $(document).ready(function(){
},
beforeload:function(){
btn(true);
},
load:function(a){
if(!bools){
var s = '<option value="0">-选择模块-</option>',len=a.modearr.length,i,csd,types='';
for(i=0;i<len;i++){
csd = a.modearr[i];
if(types!=csd.type){
if(types!='')s+='</optgroup>';
s+='<optgroup label="'+csd.type+'">';
}
s+='<option value="'+csd.id+'">'+csd.name+'</option>';
types = csd.type;
}
$('#mode_{rand}').html(s);
}
bools=true;
}
});
function btn(bo, d){
@@ -76,14 +60,17 @@ $(document).ready(function(){
guanflowviewlist = a;
addtabs({num:'flowview'+id+'',url:'main,view,edit,id='+id+',mid='+mid+'',icons:icon,name:name});
},
changemode:function(){
var v=this.value;
changemodes:function(v){
mid=v;
a.search('and modeid='+v+'');
},
xuanmode:function(o1){
js.selectmode(o1, get('modes_{rand}'), function(sna,val,d){
c.changemodes(val);
});
}
};
js.initbtn(c);
$('#mode_{rand}').change(c.changemode);
});
</script>
@@ -94,7 +81,10 @@ $(document).ready(function(){
<button class="btn btn-warning" click="clickwin,0" type="button"><i class="icon-plus"></i> 新增</button>
</td>
<td style="padding-left:10px">
<select style="width:230px" id="mode_{rand}" class="form-control" ><option value="0">-选择模块-</option></select>
<div class="btn-group" style="width:260px;" click="xuanmode">
<input class="input" placeholder="-选择模块-" style="flex:1" id="modes_{rand}" readonly>
<button class="webbtn webbtn-default">v</button>
</div>
</td>
<td width="90%">

2
webmain/main/view/viewAction.php
View File

@@ -19,7 +19,7 @@ class viewClassAction extends Action
}
return array(
'rows'=>$rows,
'modearr' => m('mode')->getmodearr(),
//'modearr' => m('mode')->getmodearr(),
);
}

36
webmain/main/xinhu/rock_xinhu_cog.php
View File

@@ -95,6 +95,37 @@ $(document).ready(function(){
js.ajax(js.getajaxurl('tongbudw','{mode}','{dir}'),false, function(ret){
js.msgok(ret);
},'get');
},
onlinev:function(){
var url = get('push_{rand}').value;
if(!url){js.msgerror('没配置服务端');return;}
js.loading('加载中...');
js.ajax(js.getajaxurl('getonline','{mode}','{dir}'),false, function(ret){
if(ret.success){
js.unloading();
c.onlinevs(ret.data);
}else{
js.msgerror(ret.msg);
js.tanclose('online');
}
},'get,json');
},
onlinevs:function(da){
var s = '',i,j,d;
for(i=0;i<da.rows.length;i++){
d = da.rows[i];
s+='<div style="margin:5px;float:left;padding:5px" class="hover" align="center">';
s+=' <div><img width="30" style="border-radius:50%" height="30" src="'+d.face+'"></div>';
s+=' <div>'+d.name+'';
if(d.pconline)s+='<span class="zhu"><i class="icon-laptop"></i></span>';
if(d.apponline)s+='<span class="zhu"><i class="icon-mobile-phone"></i></span>';
s+=' </div>';
s+='</div>';
}
js.tanbody('online','服务端在线人员', 450, 300, {
html:'<div style="height:350px;overflow:auto;display:inline-block">'+s+'</div>'
});
$('#msgview_online').html(da.msg);
}
};
@@ -115,7 +146,8 @@ $(document).ready(function(){
<td align="right"></td>
<td class="tdinput">
<button click="kuanshu1" class="btn btn-info" type="button">快速设置(推荐)</button>&nbsp;&nbsp;
<button click="kuanshu2" class="btn btn-default" type="button">自定义设置</button>
<button click="kuanshu2" class="btn btn-default" type="button">自定义设置</button>&nbsp;&nbsp;
<button click="onlinev" class="btn btn-default" type="button">在线人员</button>
</td>
</tr>
@@ -147,7 +179,7 @@ $(document).ready(function(){
<tr>
<td></td>
<td class="tdinput"><font color="#888888">不知道地址？请先安装并运行服务端，</font><a href="<?=URLY?>view_server.html" target="_blank">[去下载安装，看帮助]</a></td>
<td class="tdinput"><font color="#888888">不知道地址？请先安装并运行服务端，配置wss请看帮助，</font><a href="<?=URLY?>view_server.html" target="_blank">[去下载安装，看帮助]</a></td>
</tr>
<tr>

43
webmain/main/xinhu/xinhuAction.php
View File

@@ -27,6 +27,7 @@ class xinhuClassAction extends Action
foreach($rows as $k=>$rs){
$base = ''.DB_BASE.'_company_'.$rs['num'].'';
$this->sevessee($base, 'reimhostsystem');
$this->sevessee($base, 'reimpushurlsystem');
$this->sevessee($base, 'reimrecidsystem', $rs['num']);
$this->sevessee($base, 'reimchehuisystem');
$this->sevessee($base, 'reimservertype');
@@ -38,7 +39,14 @@ class xinhuClassAction extends Action
{
$val = $this->option->getval($key);
if($key=='reimrecidsystem')$val.='_'.$bh.'';
$sql = "update ".$base.".`[Q]option` set `value`='$val',`optdt`='{$this->now}' where `num`='$key'";
$table = "".$base.".`[Q]option`";
$where = "`num`='$key'";
$ors = $this->db->getone($table, $where);
if($ors){
$sql = "update $table set `value`='$val',`optdt`='{$this->now}' where $where";
}else{
$sql = "insert into $table set `value`='$val',`optdt`='{$this->now}',`num`='$key'";
}
$this->db->query($sql, false);
}
@@ -141,4 +149,37 @@ class xinhuClassAction extends Action
));
return $barr;
}
public function getonlineAjax()
{
$barr = m('reim')->pushserver('getonline');
if(!$barr['success'])return $barr;
$data = $barr['data'];
if(!$data)return returnerror('无人员在线');
$ondats = json_decode($data, true);
$pc = $ondats['pc'];
$app = $ondats['app'];
$uar1= explode(',', $pc);
$uar2= explode(',', $app);
$str = $pc;
$on1 = count($uar1);
$on2 = count($uar2);
if($app){
if($str)$str.=',';
$str.=$app;
}
if(!$str)return returnerror('无人员在线');
if(!$app)$on2 = 0;
if(!$pc)$on1 = 0;
$rows = m('admin')->getall('id in('.$str.') and `status`=1','id,name,face','sort asc');
foreach($rows as $k=>$rs){
$rows[$k]['pconline'] = in_array($rs['id'], $uar1);
$rows[$k]['apponline'] = in_array($rs['id'], $uar2);
}
return returnsuccess(array(
'rows' => $rows,
'msg' => 'PC在线'.$on1.'人，APP在线'.$on2.'人',
));
}
}

2
webmain/main/yingyong/rock_yingyong.php
View File

@@ -15,8 +15,6 @@ $(document).ready(function(){
}
},{
text:'分类',dataIndex:'types',editor:true,sortable:true
},{
text:'图标颜色',dataIndex:'iconcolor',editor:true
},{
text:'编号',dataIndex:'num'
},{