发布v2.7.0版本

webmain/main/flow/flowAction.php

@@ -798,6 +798,7 @@ class mode_'.$modenum.'ClassAction extends inputAction{
 		if($rows){
 			$flow 	= m('flow')->initflow($this->moders['num']);
 			$mbil 	= m('flowbill');
+			$mcom 	= m('company');
 			foreach($rows as $k=>$rs){
 				$zt 	= '';
 				if(isset($rs['status']))$zt = $rs['status'];
@@ -829,6 +830,13 @@ class mode_'.$modenum.'ClassAction extends inputAction{
 				}
 				$narr['status']		= $flow->getstatus($rs,'',$otehsr,1);
 				$narr['chushu']		= $flow->flogmodel->rows("`table`='".$flow->mtable."' and `mid`='".$rs['id']."'");
+				$comid = arrvalue($rs,'comid');
+				$narr['comid'] = $comid;
+				if($comid){
+					$cmrs  = $mcom->getXinxi($rs['comid']);
+					if($cmrs)$narr['comid']		= $cmrs['id'].'.'.$cmrs['name'];
+				}
+				
 				
 				$arr[] = $narr;
 			}

webmain/main/flow/rock_flow_view.php

@@ -19,6 +19,8 @@ $(document).ready(function(){
 			text:'ID',dataIndex:'id',sortable:true
 		},{
 			text:'状态',dataIndex:'status',sortable:true
+		},{
+			text:'所属单位',dataIndex:'comid',sortable:true
 		},{
 			text:'处理记录',dataIndex:'chushu',renderer:function(v,d,i){
 				var s=' ';

webmain/main/fwork/rock_fwork_bill.php

@@ -6,31 +6,34 @@ $(document).ready(function(){
 	if(!zt)zt='';
 	if(!mid)mid='0';
 	var bools=false;
+	
+	var columns = [{
+		text:'模块',dataIndex:'modename'
+	},{
+		text:'部门',dataIndex:'deptname'
+	},{
+		text:'申请人',dataIndex:'name'
+	},{
+		text:'单号',dataIndex:'sericnum'
+	},{
+		text:'申请日期',dataIndex:'applydt',sortable:true
+	},{
+		text:'摘要',dataIndex:'summary',align:'left',renderer:function(v){
+			return '<div style="min-width:400px">'+v+'</div>';
+		}
+	},{
+		text:'操作人',dataIndex:'optname',sortable:true
+	}];
+	
+	if(companymode)columns.push({text:'所属单位※',dataIndex:'comidname'});
+	columns.push({text:'状态',dataIndex:'status',sortable:true});
+	columns.push({text:'',dataIndex:'caozuo',callback:'opegs{rand}'});
+	
 	var a = $('#view_{rand}').bootstable({
 		tablename:'flow_bill',params:{'atype':atype,'zt':zt,'modeid':mid},fanye:true,
 		url:publicstore('{mode}','{dir}'),checked:atype=='daib',
 		storeafteraction:'flowbillafter',storebeforeaction:'flowbillbefore',
-		columns:[{
-			text:'模块',dataIndex:'modename'
-		},{
-			text:'部门',dataIndex:'deptname'
-		},{
-			text:'申请人',dataIndex:'name'
-		},{
-			text:'单号',dataIndex:'sericnum'
-		},{
-			text:'申请日期',dataIndex:'applydt',sortable:true
-		},{
-			text:'摘要',dataIndex:'summary',align:'left',renderer:function(v){
-				return '<div style="min-width:400px">'+v+'</div>';
-			}
-		},{
-			text:'操作人',dataIndex:'optname',sortable:true
-		},{
-			text:'状态',dataIndex:'status',sortable:true
-		},{
-			text:'',dataIndex:'caozuo',callback:'opegs{rand}'
-		}],
+		columns:columns,
 		celldblclick:function(){
 			c.view();
 		},