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

发布v2.7.1版本

Browse Source
This commit is contained in:
雨中磐石
2025-12-24 10:03:51 +08:00
parent 69f5376af9
commit 60f759a90c
16 changed files with 230 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webmain/model/flow/flow.php
View File

File diff suppressed because one or more lines are too long

4
webmain/model/flow/hrkaohemModel.php
View File

@@ -40,6 +40,10 @@ class flow_hrkaohemClassModel extends flowModel
foreach($zbdata as $k1=>$rs1)$str.=''.$rs1['pfname'].'('.$rs1['pfweight'].'%);';
$rs['temp_pfren'] = $str;
}
if($rs['enddt']<$this->rock->date){
$rs['ishui']=1;
$rs['enddt'].='(已截止)';
}
return $rs;
}

7
webmain/model/flow/userModel.php
View File

@@ -126,6 +126,13 @@ class flow_userClassModel extends flowModel
if($uarr)$dbs->update($uarr, $id);
}
//删除前判断
protected function flowdeletebillbefore()
{
$rs = m('flowbill')->getone('`uid`='.$this->id.' and `status`=0');
if($rs)return '此用户申请的['.$rs['modename'].']流程还未完成，不能删除，可以先停用';
}
//导入数据的测试显示
public function flowdaorutestdata()
{

6
webmain/model/flowbillModel.php
View File

@@ -156,8 +156,8 @@ class flowbillClassModel extends Model
$rers = $this->db->getone('[Q]'.$rs['table'].'', $rs['mid']);
if($rers){
$tihsrs = $flow->rsreplace($rers, 2, null, 1);
$comidname = $tihsrs['comidname'];
$summary = $this->rock->reparr($mors['summary'], $tihsrs);
$comidname = arrvalue($tihsrs,'comidname');
$summary = $this->rock->reparr($mors['summary'], $tihsrs);
$summarx = $this->rock->reparr($mors['summarx'], $tihsrs);
$ztarr = $flow->getstatus($rers, $mors['statusstr'], $rs['nowcheckname']);
@@ -323,7 +323,7 @@ class flowbillClassModel extends Model
$tihsrs = $flow->rsreplace($rers, 2, null, 1);
$summary = $this->rock->reparr($mors['summary'], $tihsrs);
$comidname = $tihsrs['comidname'];//所属单位
$comidname = arrvalue($tihsrs,'comidname');//所属单位
$nowsets = $rs['nowcheckname']; //当前审核人
$ztarr = $flow->getstatus($rers, $mors['statusstr'], $nowsets);
$statustext = $ztarr[0];

2
webmain/model/flowcourseModel.php
View File

@@ -113,7 +113,7 @@ class flowcourseClassModel extends Model
//获取显示数据
public function getTreedata($setid)
{
$drows = $this->db->getall("select *,(select count(1) from `[Q]flow_course` where `mid`=a.id)as stotal from `[Q]flow_course` a where a.`setid`='$setid' order by a.`sort`");
$drows = $this->db->getall("select *,(select count(1) from `[Q]flow_course` where `setid`=".$setid." and `mid`=a.id)as stotal from `[Q]flow_course` a where a.`setid`='$setid' order by a.`sort`");
$this->getTreedatada = array();
$this->getTreedatada[] = array(
'name' => '提交',