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

发布v2.6.9版本

Browse Source
This commit is contained in:
雨中磐石
2025-05-27 14:51:24 +08:00
parent 16829278ae
commit d0c604e040
31 changed files with 661 additions and 242 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

18
webmain/model/flow/hrsalaryModel.php
View File

@@ -40,14 +40,16 @@ class flow_hrsalaryClassModel extends flowModel
}
public function flowrsreplace($rs, $lx=0){
$s = '<font color=red>待发放</font>';
$rs['ispays'] = $rs['ispay'];
if($rs['ispay']==1)$s = '<font color=green>已发放</font>';
$rs['ispay'] = $s;
$s = '<font color=red>待核算</font>';
if($rs['isturn']==1)$s = '<font color=green>已核算</font>';
$rs['isturnss'] = $s;
if(isset($rs['ispay'])){
$s = '<font color=red>待发放</font>';
$rs['ispays'] = $rs['ispay'];
if($rs['ispay']==1)$s = '<font color=green>已发放</font>';
$rs['ispay'] = $s;
$s = '<font color=red>待核算</font>';
if($rs['isturn']==1)$s = '<font color=green>已核算</font>';
$rs['isturnss'] = $s;
}
//详情展示时
if($lx==1){

5
webmain/model/flow/wordModel.php
View File

@@ -5,6 +5,9 @@ class flow_wordClassModel extends flowModel
public function floweditoffice($frs, $ofrs)
{
$this->update("`optdt`='".$this->rock->now."'", $this->id);
}
}

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

@@ -70,6 +70,6 @@ class flow_wordxieClassModel extends flowModel
//在线编辑
public function floweditoffice($frs, $ofrs)
{
$this->update("`optdt`='".$this->rock->now."'", $this->id);
}
}