no commit message

webmain/main/goods/goodsAction.php

@@ -315,13 +315,16 @@ class goodsClassAction extends Action
 		$dgs 	= m('goods');
 		$typeb = array('0'		,'1'	  ,'2'		,'3', '4','5'); 
 		$typea = array('领用单' ,'采购单' ,'销售单'	,'调拨单', '归还单','退货单'); 
+		$biana = array('goodly' ,'caigou' ,'custxiao','diaobo', 'goodgh','tuihuo'); 
 		$chux  = array('0','2');
 		if($rows)foreach($rows as $k=>&$rs){
-			$rs['typev'] = $rs['type'];
-			$rs['type']  = arrvalue($typea, $rs['type']);
+			$rs['mknum']  = arrvalue($biana, $rs['type']);
+			$rs['typev']  = $rs['type'];
+			$rs['type']   = arrvalue($typea, $rs['type']);
 			$lx = 0; //入
 			if(in_array($rs['typev'],$chux))$lx=1;
 			$rs['state']  = $dgs->crkstate($rs['state'], $lx);
+			
 		}
 		return array(
 			'rows' 		=> $rows

webmain/main/goods/rock_goods_cropt.php

@@ -27,7 +27,10 @@ $(document).ready(function(){
 				var v='<a href="javascript:;" onclick="rukuope{rand}('+d.id+','+d.typev+')">去操作</a>';
 				return v;
 			}
-		}]
+		}],
+		itemdblclick:function(d){
+			if(d.mknum)openxiangs(d.type,d.mknum,d.id);
+		}
 	});
 	var c = {
 		search:function(){

webmain/main/userinfo/userinfoAction.php

@@ -93,8 +93,9 @@ class userinfoClassAction extends Action
 		$atatea = explode(',', '试用期,正式,实习生,兼职,临时工,离职');
 		$atrows = $this->option->getmnum('userstate');
 		foreach($atrows as $k1=>$rs1)if(!isempt($rs1['value']))$atatea[$rs1['value']] = $rs1['name'];
-		
+		$total = 0;
 		foreach($rows as $k=>$rs){
+			$total ++;
 			$year = '';
 			if(!$this->isempt($rs['workdate'])) $year = substr($rs['workdate'],0,4);
 			$rows[$k]['year'] = $year;
@@ -121,7 +122,7 @@ class userinfoClassAction extends Action
 		}
 		
 		$arr 	= array();
-		$total 	= $this->db->count;
+		//$total 	= $this->db->count;
 		foreach($rows as $k=>$rs){
 			$val = $rs[$type];
 			if($this->isempt($val))$val = '其他';
@@ -140,7 +141,7 @@ class userinfoClassAction extends Action
 
 		return array(
 			'rows' => $a,
-			'totalCound' => count($a)
+			'totalCount' => count($a)
 		);
 	}