发布v2.6.9版本

webmain/model/agent/agent.php

@@ -92,6 +92,28 @@ class agentModel extends Model
 			$barr = $barr['rows'];
 		}
 		$arr['rows'] 	= $this->showrowsface($barr);
+		
+		//合计处理
+		if($this->moders && $arr['rows']){
+			$hjfields	= arrvalue($this->moders, 'hjfields');
+			if(!isempt($hjfields)){
+				$htrows = m('base')->hjfieldsRows($arr['rowd'], $hjfields);
+				$bstr 	= '';
+				$farr 	= array();
+				foreach($this->flow->fieldsarra as $k=>$rs)$farr[$rs['fields']] = $rs['name'];
+				foreach($htrows as $k=>$v){
+					if(isset($farr[$k]) && $farr[$k]!='id'){
+						if($bstr)$bstr.="\n";
+						$bstr.=''.$farr[$k].'：'.$v.'';
+					}
+				}
+				$arr['rows'][] = array(
+					'cont' => $bstr,
+					'optdt' => '合计'
+				);
+			}
+		}
+		
 		$arr['stotal']	= $this->agenttotals($uid);
 		unset($arr['rowd']);
 		return $arr;

webmain/model/baseModel.php

@@ -101,4 +101,60 @@ class baseClassModel extends Model
 		}
 		return $str;
 	}
+	
+	/**
+	*	合计处理
+	*/
+	public function hjfieldsRows($rows, $hjfields)
+	{
+		$farr = explode('@', $hjfields);
+		$barr = array('id'=>0, 'colums_type'=>'hj');
+		foreach($farr as $fid){
+			if($fid){
+				$sbar = $this->hjfieldsRowss($rows, $fid);
+				foreach($sbar as $k=>$v)$barr[$k]=$v;
+			}
+		}
+		return $barr;
+	}
+	private function hjfieldsRowss($rows, $hjfields)
+	{
+		$tjval	= 0;
+		$hjfid	= $hjfields;
+		$slaox  = false;
+		$xshu	= 0;
+		if(contain($hjfields,':')){
+			$arr 		= explode(':', $hjfields);
+			$hjfid 		= $arr[0];
+			$hjfields 	= $arr[1];
+			$slaox = true;
+			if(isset($arr[2]))$xshu = floatval($arr[2]);
+		}
+		$strv 	= '';
+		foreach($rows as $k1=>$rs1){
+			if($slaox){
+				if($k1 > 0)$strv .= ' + ';
+				$strv .= '('.$this->rock->reparr($hjfields, $rs1).')';
+			}else{
+				$val = arrvalue($rs1, $hjfid);
+				if(isempt($val))$val='0';
+				$tjval += floatval($val);
+				if($xshu == 0){
+					$vals = ''.$val.'';
+					if(contain($vals, '.')){
+						$avla = explode('.', $vals);
+						if(isset($avla[1]))$xshu = strlen($avla[1]);
+					}
+				}
+			}
+		}
+		if($strv){
+			$tjval = eval('return '.$strv.';');
+		}
+		if($xshu > 0)$tjval = $this->rock->number($tjval, $xshu);
+		return array(
+			$hjfid => $tjval
+		);
+	}
+	
 }

webmain/model/flow/hrsalaryModel.php

@@ -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){

webmain/model/flow/wordModel.php

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

webmain/model/flow/wordxieModel.php

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