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

发布v2.5.5版本

Browse Source
This commit is contained in:
雨中磐石
2023-04-05 13:00:20 +08:00
parent bc69541c7b
commit 33ce4c6298
102 changed files with 570 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
webmain/main/customer/customerAction.php
View File

@@ -1,6 +1,7 @@
<?php
class customerClassAction extends Action
{
public $month;
public function custtotalbefore($table)
{
$where = '';

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

@@ -172,7 +172,7 @@ PRIMARY KEY (`id`),KEY `mid` (`mid`)
if(!$alltabls)$alltabls = $this->db->getalltable();
if($isflow==0){
if(!in_array(''.PREFIX.''.$tab.'', $alltabls)){
$sql = "CREATE TABLE `[Q]".$tab."` (`id` int(11) NOT NULL AUTO_INCREMENT,`comid` smallint(6) DEFAULT '0' COMMENT '对应单位id',`optid` int(11) DEFAULT '0' COMMENT '操作人id',`optname` varchar(20) DEFAULT NULL COMMENT '操作人',`optdt` datetime DEFAULT NULL COMMENT '操作时间',PRIMARY KEY (`id`))ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='$name';";
$sql = "CREATE TABLE `[Q]".$tab."` (`id` int(11) NOT NULL AUTO_INCREMENT,`comid` smallint(6) DEFAULT '0' COMMENT '对应单位id',`uid` int(11) DEFAULT '0',`optid` int(11) DEFAULT '0' COMMENT '操作人id',`optname` varchar(20) DEFAULT NULL COMMENT '操作人',`optdt` datetime DEFAULT NULL COMMENT '操作时间',PRIMARY KEY (`id`))ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='$name';";
$bo = $this->db->query($sql);
}else{
$fields = $this->db->getallfields(''.PREFIX.''.$tab.'');
@@ -251,6 +251,7 @@ PRIMARY KEY (`id`),KEY `mid` (`mid`)
);
}
public $mid;
public function elementbefore($table)
{
$mid = (int)$this->post('mid');
@@ -494,7 +495,7 @@ PRIMARY KEY (`id`),KEY `mid` (`mid`)
$rs = m('flow_set')->getone("`id`='$setid'");
if(!$rs)exit('sorry!');
$rs['zibiaoshu'] = count(explode(',', $rs['tables']));
$rs['zibiaoshu'] = count(explode(',', (string)$rs['tables']));
$this->smartydata['rs'] = $rs;
$this->title = $rs['name'].'_录入页面设置';
$fleftarr = m('flow_element')->getrows("`mid`='$setid'",'*','`iszb`,`sort`');

1
webmain/main/flow/rock_flow_set.php
View File

@@ -26,6 +26,7 @@ $(document).ready(function(){
if(v=='2')s='顺序前置';
if(v=='3')s='自由流程';
if(v=='4')s='选择流程';
if(v=='5')s='自定义流程';
return s;
}
},{

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

@@ -1,6 +1,7 @@
<?php
class fworkClassAction extends Action
{
public $atypess,$modeids;
/**
* 流程申请获取数组

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

@@ -1,7 +1,7 @@
<?php
class goodsClassAction extends Action
{
public $goodsobj;
public function initAction()
{
$this->goodsobj = m('goods');

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

@@ -1,7 +1,7 @@
<?php
class kaoqinClassAction extends Action
{
public function kqdkjlaftershow($table, $rows)
{
@@ -22,25 +22,37 @@ class kaoqinClassAction extends Action
$dt1 = $this->post('dt1');
$dt2 = $this->post('dt2');
$msg = '获取成功';
if($reimbo->installwx(1)){
$barr = m('weixinqy:daka')->getrecord($uids, $dt1, $dt2, 1);
//加入异步
$send = 0;
if($uids=='' && $barr['errcode']==0 && $barr['maxpage']>1){
for($i=1;$i<=$barr['maxpage'];$i++){
if($i>1)$reimbo->asynurl('asynrun','wxdkjl', array(
'dt1' => $dt1,
'dt2' => $dt2,
'page' => $i
));
}
$send++;
}
if($barr['errcode']!=0){
$msg .= ',企业微信('.$barr['msg'].')';
$daka = $this->option->getval('qywxplat_daka');
if($daka=='1'){
$barr = c('rockqywx')->getcheckindata($uids, $dt1, $dt2, 1);
if(!$barr['success']){
$msg = $barr['msg'];
}else{
if(isset($barr['zongts']))$msg .= ',微信打卡(共'.$barr['zongts'].'条,新增'.$barr['okload'].'条)';
if($send>0)$msg .= ',并发送异步请求'.$send.'条';
$data = $barr['data'];
$msg .= ',从代建中应用获取打卡(共'.$data['zongts'].'条,新增'.$data['okload'].'条)';
if($data['maxpage']>1)$msg.=',并发送异步请求1条';
}
}else{
if($reimbo->installwx(1)){
$barr = m('weixinqy:daka')->getrecord($uids, $dt1, $dt2, 1);
//加入异步
$send = 0;
if($uids=='' && $barr['errcode']==0 && $barr['maxpage']>1){
for($i=1;$i<=$barr['maxpage'];$i++){
if($i>1)$reimbo->asynurl('asynrun','wxdkjl', array(
'dt1' => $dt1,
'dt2' => $dt2,
'page' => $i
));
}
$send++;
}
if($barr['errcode']!=0){
$msg .= ',企业微信('.$barr['msg'].')';
}else{
if(isset($barr['zongts']))$msg .= ',微信打卡(共'.$barr['zongts'].'条,新增'.$barr['okload'].'条)';
if($send>0)$msg .= ',并发送异步请求'.$send.'条';
}
}
}
@@ -142,7 +154,7 @@ class kaoqinClassAction extends Action
public $rows;
public function kqsjgzdataAjax()
{
$this->rows = array();
@@ -461,6 +473,7 @@ class kaoqinClassAction extends Action
//考勤统计
public $months;
public function kqtotalbeforeshow($table)
{
$dt1 = $this->post('month', date('Y-m'));

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

@@ -2,6 +2,7 @@
//服务端设置
class xinhuClassAction extends Action
{
public $xinhuobj;
public function initAction()
{
$this->xinhuobj = c('xinhuapi');

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

@@ -66,6 +66,22 @@ $(document).ready(function(){
},
reload:function(){
a.reload();
},
addmodyy:function(){
js.prompt('请输入模块编号','模块编号可以到【流程模块→流程模块列表】下查看', function(jg,txt){
if(jg=='yes' && txt)c.addmodyyss(txt);
});
},
addmodyyss:function(bh){
js.loading('处理中...');
js.ajax(js.getajaxurl('createying','{mode}','{dir}'),{bh:bh},function(ret){
if(ret.success){
a.reload();
js.msgok('创建成功');
}else{
js.msgerror(ret.msg);
}
},'get,json');
}
}
@@ -84,6 +100,7 @@ $(document).ready(function(){
<ul class="floats">
<li class="floats50">
<button class="btn btn-primary" click="clickwin,0" type="button"><i class="icon-plus"></i> 新增应用</button> &nbsp;
<button class="btn btn-primary" click="addmodyy,0" type="button"><i class="icon-plus"></i> 新增模块应用(推荐)</button> &nbsp;
</li>
<li class="floats50" style="text-align:right">

59
webmain/main/yingyong/yingyongAction.php
View File

@@ -39,7 +39,7 @@ class yingyongClassAction extends Action
return array('msg'=>$msg);
}
public $rows;
public function menudataAjax()
{
$this->rows = array();
@@ -94,4 +94,61 @@ class yingyongClassAction extends Action
'rows' => $rows
);
}
public function createyingAjax()
{
$bh = $this->get('bh');
$mrs = m('flow_set')->getone("`num`='$bh'");
if(!$mrs)return returnerror('编号为“'.$bh.'”的模块不存在');
$wherrows = m('flow_where')->getall('`setid`='.$mrs['id'].' and ifnull(`num`,\'\')<>\'\'','*','`sort`');
if(!$wherrows)return returnerror('模块“'.$mrs['name'].'”未创建流程模块条件');
$db = m('im_group');
$dbs = m('im_menu');
if($db->rows("`num`='$bh' and `type`=2")>0)return returnerror('编号为“'.$bh.'”的应用已经存在了');
$sort = 100*$mrs['id'];
$dsrs = $db->getone("`types`='".$mrs['type']."'",'*','`sort` desc');
if($dsrs)$sort = (int)$dsrs['sort']+1;
$udb['name'] = $mrs['name'];
$udb['types'] = $mrs['type'];
$udb['num'] = $mrs['num'];
$udb['url'] = 'auto';
$udb['type'] = 2;
$udb['face'] = 'images/logo.png';
$udb['sort'] = $sort;
$mid = $db->insert($udb);
$xdar0 = $xdar1 = array();
foreach($wherrows as $k=>$rs){
if(!$xdar0 && isempt($rs['pnum']))$xdar0 = $rs;
if(!$xdar1 && !isempt($rs['pnum']))$xdar1 = $rs;
}
$iar['mid'] = $mid;
if($xdar0){
$iar['name'] = $xdar0['name'];
$iar['url'] = $xdar0['num'];
$iar['type'] = 0;
$iar['sort'] = 0;
$dbs->insert($iar);
}
if($xdar1){
$iar['name'] = $xdar1['name'];
$iar['url'] = $xdar1['num'];
$iar['receid'] = 'u'.$this->adminid.'';
$iar['recename'] = $this->adminname;
$iar['type'] = 0;
$iar['sort'] = 1;
$dbs->insert($iar);
}
$iar['name'] = '＋新增';
$iar['url'] = 'add';
$iar['receid'] = '';
$iar['recename'] = '';
$iar['type'] = 1;
$iar['sort'] = 2;
$dbs->insert($iar);
return returnsuccess();
}
}