更新代码

protected/config/routes.conf.php

@@ -313,7 +313,9 @@ $route['*']['/avatar'] = array('MainController', 'avatar');
 //$route['*']['/synClient'] = array('MainController', 'synClient');
 $route['*']['/ajaxExamine'] = array('ReceiptController', 'ajaxExamine');
 
-
+$route['*']['/BUGFLAG'] = array('ReceiptController', 'BUGFLAG','authName' =>  'Hello', 'auth' => array('BF390' => 'BF390'));
+$route['*']['/BUGFLAG/:status'] = array('ReceiptController', 'BUGFLAG', 'authName' =>  'Hello','auth' => array('BF390' => 'BF390'));
+$route['*']['/BUGFLAG/:status/:page'] = array('ReceiptController', 'BUGFLAG','authName' =>  'Hello', 'auth' => array('BF390' => 'BF390'));
 
 //APP
 $route['*']['/api/login'] = array('MobileController', 'loginHttp');
@@ -352,13 +354,13 @@ $route['*']['/error'] = array('ErrorController', 'index');
 //开票
 $route['*']['/adminInvoice'] = array('AdminController', 'adminInvoice');
 $route['*']['/addInvoiceManage'] = array('AdminController', 'addInvoiceManage');
-
+$route['*']['/delInvoiceManage/:uid/:iid'] = array('AdminController', 'delInvoiceManage');
 
 $route['*']['/invoice'] = array('InvoiceController', 'invoice');
 $route['*']['/invoiceAdd'] = array('InvoiceController', 'invoiceAdd');
 $route['*']['/invoiceAddDo'] = array('InvoiceController', 'invoiceAddDo');
 $route['*']['/invoiceApproval'] = array('InvoiceController', 'invoiceApproval');
-
+$route['*']['/invoiceDetail/:iid'] = array('InvoiceController', 'invoiceDetail','extension'=>'.html');
 
 
 

protected/controller/AdminController.php

@@ -835,6 +835,34 @@ function adminDeleteUser(){
 		return "/adminInvoice";
 	}
 	
+	function delInvoiceManage(){
+		$uid=isset($this->params['uid'])&&is_numeric($this->params['uid'])?$this->params['uid']:0;	
+		$iid=isset($this->params['iid'])&&is_numeric($this->params['iid'])?$this->params['iid']:0;	
+		
+		if(!empty($uid)&&!empty($iid)){
+			Doo::loadModel("invoiceManage");
+			$execute=new invoiceManage();
+			
+			$executeInfo=$execute->getOne(array('where'=>'iid ="'.$iid.'" ','asArray'=>true));
+			if (empty($executeInfo))
+				return "/adminInvoice";
+			
+			$ini=array();
+			$list=json_decode($executeInfo['staff'],true);
+			foreach ($list as $k=>$v){
+				if ($v[0]==$uid){
+					$ini=$list[$k];
+					unset($list[$k]);break;
+				}
+			}	
+			
+			$execute->staff=json_encode($list);
+			$execute->update(array('where'=>'iid = '.$executeInfo['iid']));
+		}
+		
+		return "/adminInvoice";
+	}
+	
 	function ajaxRoleStaff(){
 		
 		$name=$this->get_args('name')?$this->get_args('name'):"";

protected/controller/InvoiceController.php

@@ -131,8 +131,11 @@ class InvoiceController extends DooController {
 			$invoice=new invoice();
 			Doo::loadModel('L_category');
 			$lCategory=new L_category();
+			Doo::loadModel('invoiceManage');
+			$invoiceManage=new invoiceManage();
 			
 			$categoryDetil=$lCategory->getOne(array('SELECT'=>'title','where'=>'cid='.$cid,'asArray'=>true));
+			$invoiceManageDetail=$invoiceManage->getOne(array('SELECT'=>'title','where'=>'mold="发票审批"','asArray'=>true));
 			
 			$invoice->cid=$cid;
 			$invoice->categoryName=$categoryDetil['title'];
@@ -162,6 +165,9 @@ class InvoiceController extends DooController {
 			$invoice->date=date("'Y-m-d H:i:s");
 			$invoice->sid=$this->staff[0]['sid'];
 			$invoice->userName=$this->staff[0]['username'];
+			$invoice->invoiceManage=$invoiceManageDetail['staff'];
+			$staffId=$a=json_decode($invoiceManageDetail['staff']);
+			$invoice->pendingApprovals=$staffId[0][0];
 			$invoice->insert();
 		}
 		
@@ -172,8 +178,10 @@ class InvoiceController extends DooController {
 		
 		Doo::loadModel('invoice');
 		$invoice=new invoice();
+		Doo::loadModel('invoiceManage');
+		$invoiceManage=new invoiceManage();
 		
-		$invoiceList=$invoice->find(array('where'=>'status=1','asArray'=>true));
+		$invoiceList=$invoice->find(array('where'=>'status=1 and pendingApprovals='.$this->staff[0]['sid'],'asArray'=>true));
 		
 		$data['invoiceList']=$invoiceList;
 		
@@ -185,6 +193,32 @@ class InvoiceController extends DooController {
 		$this->render ( "/admin/invoiceApproval", $data );
 	}
 	
+	function invoiceDetail(){
+		
+		$iid=isset($this->params['iid'])&&is_numeric($this->params['iid'])?$this->params['iid']:0;
+		
+		Doo::loadModel('invoice');
+		$invoice=new invoice();
+		Doo::loadModel('invoiceManage');
+		$invoiceManage=new invoiceManage();
+		
+		$invoiceDetail=$invoice->getOne(array('where'=>'status=1 and pendingApprovals='.$this->staff[0]['sid'],'asArray'=>true));
+		
+		$invoiceManageDetail=$invoiceManage->getOne(array('SELECT'=>'title','where'=>'mold="发票审批"','asArray'=>true));
+		
+		$a=json_decode($invoiceManageDetail['staff']);
+		
+		
+		$data['invoiceDetail']=$invoiceDetail;
+		
+		$data['memu']="invoice";
+		$data['staff']=$this->staff;
+		$data['receiptMemu']='invoiceApproval';
+		$data['verifyId']=$this->verifyId;
+		$data['executeId']=$this->executeId;
+		$this->render ( "/admin/invoiceApprovalDetail", $data );
+	}
+	
 	private function getExeCount(){
 		Doo::loadModel('receipt');
 		$receipt=new receipt();

protected/controller/MainController.php

@@ -2309,7 +2309,11 @@ class MainController extends DooController {
 		Doo::loadModel ( 'longle' );
 		$longle = new longle ();
 		
-		$staffList=$staff->find(array ('where' => "isadmin= 0",'asArray' => TRUE));
+		$staffCondition="";
+		if($this->staff[0]['cid']!=12)
+			$staffCondition=" and cid=".$this->staff[0]['cid'];
+		
+		$staffList=$staff->find(array ('where' => "isadmin= 0 ".$staffCondition,'asArray' => TRUE));
 		Doo::db()->beginTransaction();
 		foreach ($staffList as $key=>$value){// not in(1,2)
 			$sum=$longle->count(array ('where' => "status!= 1 and responsible ='".$value['username']."'",'asArray' => TRUE));
@@ -2322,6 +2326,7 @@ class MainController extends DooController {
 		}
 		Doo::db()->commit();
 		
+		$data['staff']=$this->staff;
 		$data['staffList']=$staffList;
 		$data['memu']="keyStatistics";
 		$this->render ( "lock_count", $data );

protected/controller/ReceiptController.php

@@ -48,24 +48,10 @@ class ReceiptController extends DooController {
 		
 		Doo::loadModel('receipt');
 		$receipt=new receipt();
-		Doo::loadModel('verify');
-//		$verify=new verify();
-//		
-//		//user verify ID
-//		$vidList=array();
-//		$verifyDetail=$verify->find(array('where'=>'staff like "%\"'.$this->staff[0]['sid'].'\"%"','asArray'=>true));
-//		foreach ($verifyDetail as $key=>$value){
-//			array_push($vidList, $value['vid']);
-//		}
-//		$vid=implode(",", $vidList);
-//		if(empty($verifyDetail))
-//			$vid=0;
-		
+
 		$dateCondition=" and Year(date) =".$year;	
-		//$approvalCondition=' and verifyStaff not like "%\"'.$this->staff[0]['sid'].'\":{%" ';
-			
-		//$receiptList=$receipt->find(array('where'=>'verify in('.$vid.') and status='.$status.$dateCondition.$approvalCondition,'desc'=>'rid','asArray'=>true));
-		$approvalCondition=' and nowStaff like "%'.$this->staff[0]['sid'].'%" ';
+
+		$approvalCondition=' and (nowStaff like "%,'.$this->staff[0]['sid'].'%" or nowStaff like "%'.$this->staff[0]['sid'].',%" or nowStaff='.$this->staff[0]['sid'].' ) ';
 		$receiptList=$receipt->find(array('where'=>' status='.$status.$dateCondition.$approvalCondition,'desc'=>'rid','asArray'=>true));
 		
 		return count($receiptList);
@@ -2293,7 +2279,7 @@ class ReceiptController extends DooController {
 		$Lcategory=new L_category();
 		
 		//user verify ID
-		$verifyDetail=$verify->find(array('where'=>'staff like "%\"'.$this->staff[0]['sid'].'%"','asArray'=>true));
+$verifyDetail=$verify->find(array('where'=>' (staff not like "%\"'.$this->staff[0]['sid'].'\",\"ROLE%") and (staff like "%[\"'.$this->staff[0]['sid'].'\",%" or staff like "%\"'.$this->staff[0]['sid'].'\_%" )','asArray'=>true));
 		foreach ($verifyDetail as $key=>$value){
 			array_push($vidList, $value['vid']);
 		}
@@ -2323,7 +2309,7 @@ class ReceiptController extends DooController {
 		$approvalCondition=" and status=".$status;
 		if($status==2){
 			//查找角色审批人
-			$approvalCondition=' and status='.$status.' and nowStaff like "%'.$this->staff[0]['sid'].'%" ';
+			$approvalCondition=' and status='.$status.' and (nowStaff like "%,'.$this->staff[0]['sid'].'%" or nowStaff like "%'.$this->staff[0]['sid'].',%" or nowStaff='.$this->staff[0]['sid'].' )';
 		}
 		
 		if($status==5){//and verifyStaff like "%\"'.$this->staff[0]['sid'].'\":{%"
@@ -2341,11 +2327,12 @@ class ReceiptController extends DooController {
 			
 			$receiptList=$receipt->find(array('where'=>'status!=5  '.$dateCondition.$cateCondition.$staffCondition.' and verify in ('.$vid.')'
 			,'limit'=>$pageinfo ['lower'].','.$page_size,'desc'=>'rid','asArray'=>true));
+			//echo 'status!=5  '.$dateCondition.$cateCondition.$staffCondition.' and verify in ('.$vid.')';
 		}else
 		$receiptList=$receipt->find(array('where'=>'status!=5 '.$dateCondition.$cateCondition.$staffCondition.$approvalCondition.' and verify in ('.$vid.')'
 		,'desc'=>'rid','asArray'=>true));
 		
-		$rLRes=$receipt->find(array('where'=>'status=2 and nowStaff like "%'.$this->staff[0]['sid'].'%" '.$cateCondition.$staffCondition
+		$rLRes=$receipt->find(array('where'=>'status=2 and (nowStaff like "%,'.$this->staff[0]['sid'].'%" or nowStaff like "%'.$this->staff[0]['sid'].',%" or nowStaff='.$this->staff[0]['sid'].' )'.$cateCondition.$staffCondition
 		,'desc'=>'rid','asArray'=>true));
 		
 		//echo '1 '.$dateCondition.$cateCondition.$staffCondition.' and verify in ('.$vid.')';
@@ -4447,7 +4434,7 @@ class ReceiptController extends DooController {
 		
 		if (!empty($rid)){
 			
-			$rLRes=$receipt->find(array('where'=>'status=2 and nowStaff like "%'.$this->staff[0]['sid'].'%" and rid!='.$rid
+			$rLRes=$receipt->find(array('where'=>'status=2 and (nowStaff like "%,'.$this->staff[0]['sid'].'%" or nowStaff like "%'.$this->staff[0]['sid'].',%" or nowStaff='.$this->staff[0]['sid'].' ) and rid!='.$rid
 		,'asArray'=>true));
 		 echo json_encode(array('status'=>1,'receipt'=>$rLRes[0]));die; 	
 		}
@@ -5427,7 +5414,7 @@ class ReceiptController extends DooController {
 		
 		if($status==2){
 			//查找角色审批人
-			$approvalCondition=' and nowStaff like "%'.$this->staff[0]['sid'].'%" ';
+			$approvalCondition=' and (nowStaff like "%,'.$this->staff[0]['sid'].'%" or nowStaff like "%'.$this->staff[0]['sid'].',%" or nowStaff='.$this->staff[0]['sid'].' ) ';
 		}
 		$ap="";
 		if($status==4){
@@ -8529,6 +8516,164 @@ class ReceiptController extends DooController {
 		$this->render ( "/admin/saeaStaffCollectDetail", $data );
 	}
 	
+	function BUGFLAG(){
+		$status=isset($this->params['status'])&&is_numeric($this->params['status'])?$this->params['status']:0;
+		$year=$this->get_args('year')?$this->get_args('year'):date('Y');
+		$month=$this->get_args('month')?$this->get_args('month'):"";
+		$cid=$this->get_args('cid')?$this->get_args('cid'):0;
+		$sid=$this->get_args('sid')?$this->get_args('sid'):0;
+		
+		if (empty($status))
+			$status=$this->get_args('status')&&is_numeric($this->get_args('status'))?$this->get_args('status'):0;
+			
+		$page_size=12;	
+		$page = isset($this->params ['page'])&&is_numeric ( $this->params ['page'] ) ? $this->params ['page'] : 1;	
+			
+		$vidList=array();
+		$button=0;
+		
+		Doo::loadModel('verify');
+		$verify=new verify();
+		Doo::loadModel('receipt');
+		$receipt=new receipt();
+		Doo::loadModel('staff');
+		$staff=new staff();
+		Doo::loadModel('L_category');
+		$Lcategory=new L_category();
+		
+		
+			$dateCondition=" and Year(date) =".$year;
+		
+		if(!empty($month))
+			$dateCondition=" and Year(date) =".$year." and Month(date) = ".$month;		
+			
+		$categoryList=$Lcategory->find(array('asArray'=>true));	
+		$staffList=$staff->find(array('where'=>'cid='.$cid,'asArray'=>true));
+		$cateCondition="";$staffCondition="";$approvalCondition="";
+		if (!empty($cid))
+			$cateCondition=' and cid='.$cid;
+		if(!empty($sid)){
+			$staffCondition=' and staff='.$sid;
+			$cateCondition="";
+		}
+		
+
+		$approvalCondition=" and status=".$status;
+		if($status==2){
+			//查找角色审批人
+			$approvalCondition=' and status='.$status.' and (nowStaff like "%,'.$this->staff[0]['sid'].'%" or nowStaff like "%'.$this->staff[0]['sid'].',%" or nowStaff='.$this->staff[0]['sid'].' )';
+		}
+		
+		if($status==5){//and verifyStaff like "%\"'.$this->staff[0]['sid'].'\":{%"
+			$approvalCondition=' and status=2  ';
+		}
+		
+		if($status==1){
+			$approvalCondition=' and (status='.$status.' or status=6)  ';
+		}
+		
+		//nowStaff like "%'.$this->staff[0]['sid'].'%"
+		$pageinfo['page']=array('previous'=>'');
+		if ($status==0){
+			$pageinfo=$this->get_page("CLD_receipt", $dateCondition.$cateCondition.$staffCondition.'  and status!=5', $page, $page_size, "approvalExpenses","","");	
+			
+			$receiptList=$receipt->find(array('where'=>'status!=5  '.$dateCondition.$cateCondition.$staffCondition
+			,'limit'=>$pageinfo ['lower'].','.$page_size,'desc'=>'rid','asArray'=>true));
+			//echo 'status!=5  '.$dateCondition.$cateCondition.$staffCondition.' and verify in ('.$vid.')';
+		}else
+		$receiptList=$receipt->find(array('where'=>'status!=5 '.$dateCondition.$cateCondition.$staffCondition.$approvalCondition
+		,'desc'=>'rid','asArray'=>true));
+		
+		$rLRes=$receipt->find(array('where'=>'status=2 and (nowStaff like "%,'.$this->staff[0]['sid'].'%" or nowStaff like "%'.$this->staff[0]['sid'].',%" or nowStaff='.$this->staff[0]['sid'].' )'.$cateCondition.$staffCondition
+		,'desc'=>'rid','asArray'=>true));
+		
+		//echo '1 '.$dateCondition.$cateCondition.$staffCondition.' and verify in ('.$vid.')';
+		//print_r($pageinfo);
+		
+		$Locate=0;
+		
+		foreach ($receiptList as $key=>$value){
+			$receiptList[$key]['Locate']=$Locate;$Locate++;
+			$receiptList[$key]['reviseDetail']=array();
+			if (!empty($value['reviseDetail']))
+				$receiptList[$key]['reviseDetail']=json_decode($value['reviseDetail'],true);
+			$receiptList[$key]['accountItem']=json_decode($value['accountItem'],true);
+			$categoryDetil=$Lcategory->getOne(array('where'=>'cid='.$value['cid'],'asArray'=>true));
+			$receiptList[$key]['category']=$categoryDetil['title'];
+			$verifyList=$verify->getOne(array('where'=>'vid='.$value['verify'],'asArray'=>true));
+			$verifyList=json_decode($verifyList['staff'],true);//status opinion
+			$verifyStaff=json_decode($value['verifyStaff'],true);
+			foreach ($verifyList as $k=>$v){
+				//init verifyStaff
+				$verifyList[$k]['date']="";
+				$verifyList[$k]['opinion']="";
+				$verifyList[$k]['status']="";
+				if (empty($verifyStaff)){
+					$verifyList[$k]['date']="";
+					$verifyList[$k]['opinion']="";
+					if ($v[0]==$this->staff[0]['sid']){
+						$verifyList[$k]['status']=4;
+						$button=4;
+					}
+				}else{
+					$flag=true;
+					foreach ($verifyStaff as $m=>$u){
+						if ($v[0]==$m){
+							$verifyList[$k]['date']=$u['date'];
+							$verifyList[$k]['opinion']=$u['opinion'];
+							$verifyList[$k]['status']=$u['status'];
+							$flag=false;
+							break;
+						}
+//						elseif($v[0]==$this->staff[0]['sid']){$verifyList[$k]['status']=4;break;}
+//						if ($v[0]==$this->staff[0]['sid']&&$m!=$this->staff[0]['sid']){$verifyList[$k]['status']=4;}
+//						if($v[0]==$this->staff[0]['sid']&&$v[0]==$m){if ($u['status']!=1&&$u['status']!=3)$button=4;}
+					}
+					if($flag){//检测可编辑
+						if($v[0]==$this->staff[0]['sid']){
+							$verifyList[$k]['status']=4;$button=4;
+						}
+					}
+				}
+			}
+			$receiptList[$key]['verifyList']=$verifyList;
+			$receiptList[$key]['staffDetail']=$staff->getOne(array('where'=>'sid='.$value['staff'],'asArray'=>true));
+			$receiptList[$key]['button']=$button;
+			$receiptList[$key]['nowStaffArray']=explode(',',$value['nowStaff']); 
+		}
+		//print_r($receiptList);die;
+		//$data['verifyDetail']=$verifyDetail;
+		
+		$mothHtml="";
+		for($i=1;$i<=12;$i++){
+			if($month==$i)
+				$mothHtml.='<option selected value="'.$i.'">'.$i.'月</option>';
+			else
+				$mothHtml.='<option value="'.$i.'">'.$i.'月</option>';
+		}
+		$data['mothHtml']=$mothHtml;
+		
+		$data['page']=$pageinfo;
+		$data['receiptList']=$receiptList;
+		$data['receiptApprovalCount']=count($rLRes);
+		$data['status']=$status;
+		$data['year']=$year;
+		$data['categoryList']=$categoryList;
+		$data['staffList']=$staffList;
+		$data['cid']=$cid;
+		$data['sid']=$sid;
+		
+		//print_r($receiptList);
+		
+		$data['memu']="receipt";
+		$data['staff']=$this->staff;
+		$data['receiptMemu']='approvalExpenses';
+		$data['verifyId']=$this->verifyId;
+		
+		$data['executeId']=$this->executeId;
+		$this->render ( "/admin/FALG", $data );
+	}
+	
 	function ajaxGetReceiptOrder(){
 		$receiptOrder=$this->get_args('receiptOrder')?$this->get_args('receiptOrder'):"";
 		

protected/model/invoice.php

@@ -6,8 +6,11 @@ class invoice extends DooModel {
 
     public $iid;
     public $status;
+    public $invoiceManage;
+    public $pendingApprovals;
     public $invoiceSerial;
     public $invoicePrice;
+    
     public $cid;
     public $categoryName;
     public $sid;
@@ -36,7 +39,7 @@ class invoice extends DooModel {
     public $_table = 'CLD_invoice';
     public $_primarykey = 'iid';
     
-    public $_fields = array('iid', 'status' ,'invoicePrice', 'cid','categoryName', 'remark', 'invoiceElement','invoiceType', 'invoiceTitle', 'invoiceCompany'
+    public $_fields = array('iid','invoiceManage', 'pendingApprovals' ,'status' ,'invoicePrice', 'cid','categoryName', 'remark', 'invoiceElement','invoiceType', 'invoiceTitle', 'invoiceCompany'
     , 'TIN', 'address','phone', 'bank', 'bankAccount','doPost', 'recipients', 'recipientsPhone','recipientsAddress', 'mailItems','sid','userName','date');
 
    

protected/view/admin/approvalExpenses.html

@@ -152,7 +152,7 @@
 	  							
 	  							{{page.page}}
 	  							
-	  							<!-- if {{page.on_page}}<3 && {{page.total_page}}>1 -->
+	  							<!-- if {{page.on_page}}<3 && {{page.total_page}}>5 -->
 	  							<li><a href="/approvalExpenses/0/4" >4</a></li>
 	  							<li><a href="/approvalExpenses/0/5" >5</a></li>
 	  							<!-- endif -->

protected/view/admin/invoiceApproval.html

@@ -47,7 +47,7 @@
                                     </td>
                                     <td>{{invoiceList' value.categoryName}}{{invoiceList' value.userName}} {{invoiceList' value.date}}</td>
                                     <td></td>
-                                    <td><a class="button btn-block" href="invoice-approval-detail.html" >审批开票</a></td>
+                                    <td><a class="button btn-block" href="/invoiceDetail/{{invoiceList' vlaue.iid}}.html" >审批开票</a></td>
                                 </tr>
                                 <!-- endloop -->
                                 

protected/view/admin/receipt_menu.html

@@ -18,6 +18,64 @@
 						<!-- endif -->
 						
 						<!-- endif -->
+						<li class="topLine"><a href="#welcome" data-toggle="modal">使用帮助</a></li>
+
+				</ul>
+						<!--弹出邮寄-->
+<div class="modal fade" id="welcome">
+	<div class="modal-dialog">
+		<div class="modal-content">
+		    <div class="modal-header">
+		    <h3>欢迎使用费用管理（原报销单）</h3>
+		    </div>
+		    <div class="modal-body saeaList">
+		    	<p style="font-size:18px">请查阅以下文档，了解新的费用管理</p>
+		    	<br>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC colRed" width="100">费用管理简介<br>（必读）</th>
+						<td class="taC">
+						<a target="_Blank" href="<?= WEB_SITE_GLOBAL ?>handbook/CLD费用管理简介.pdf">在线查阅《CLD费用管理简介》</a>
 						
-						
-				</ul>
+						</td>
+						<td class="taC"><a href="<?= WEB_SITE_GLOBAL ?>handbook/CLD费用管理简介.docx">点击下载《CLD费用管理简介》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用申请人</th>
+						<td class="taC"><a target="_Blank" href="<?= WEB_SITE_GLOBAL ?>handbook/费用申请人使用教程.pdf">在线查阅《费用申请人使用手册》</a></td>
+						<td class="taC"><a href="<?= WEB_SITE_GLOBAL ?>handbook/费用申请人使用教程.docx">点击下载《费用申请人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用审批人</th>
+						<td class="taC"><a target="_Blank" href="<?= WEB_SITE_GLOBAL ?>handbook/费用审批人使用教程.pdf">在线查阅《费用审批人使用手册》</a></td>
+						<td class="taC"><a href="<?= WEB_SITE_GLOBAL ?>handbook/费用审批人使用教程.docx">点击下载《费用审批人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用执行人</th>
+						<td class="taC"><a target="_Blank" href="<?= WEB_SITE_GLOBAL ?>handbook/费用执行人使用教程.pdf">在线查阅《费用执行人使用手册》</a></td>
+						<td class="taC"><a href="<?= WEB_SITE_GLOBAL ?>handbook/费用执行人使用教程.docx">点击下载《费用执行人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+		    </div>
+			<div class="modal-footer">
+			    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+			</div>
+		</div>
+	</div>
+</div>
+    <!--邮寄-->	
+						

protected/view/admin/saeaBorad.html

@@ -131,59 +131,60 @@
 <div class="modal fade" id="welcome">
 	<div class="modal-dialog">
 		<div class="modal-content">
-    <div class="modal-header">
-    <h3>欢迎使用费用管理（原报销单）</h3>
-    </div>
-    <div class="modal-body saeaList">
-    	<p style="font-size:18px">请查阅以下文档，了解新的费用管理</p>
-    	<br>
-		<table class="table table-bordered table-condensed">
-			<tbody>
-			<tr>
-				<th class="taC colRed" width="100">费用管理简介<br>（必读）</th>
-				<td class="taC">
-				<a target="_Blank" href="<?= WEB_SITE_GLOBAL ?>handbook/CLD费用管理简介.pdf">在线查阅《CLD费用管理简介》</a>
-				
-				</td>
-				<td class="taC"><a href="<?= WEB_SITE_GLOBAL ?>handbook/CLD费用管理简介.docx">点击下载《CLD费用管理简介》</a></td>
-			</tr>
-			</tbody>
-		</table>
-		<table class="table table-bordered table-condensed">
-			<tbody>
-			<tr>
-				<th class="taC" width="100">费用申请人</th>
-				<td class="taC"><a target="_Blank" href="<?= WEB_SITE_GLOBAL ?>handbook/费用申请人使用教程.pdf">在线查阅《费用申请人使用手册》</a></td>
-				<td class="taC"><a href="<?= WEB_SITE_GLOBAL ?>handbook/费用申请人使用教程.docx">点击下载《费用申请人使用手册》</a></td>
-			</tr>
-			</tbody>
-		</table>
-		<table class="table table-bordered table-condensed">
-			<tbody>
-			<tr>
-				<th class="taC" width="100">费用审批人</th>
-				<td class="taC"><a target="_Blank" href="<?= WEB_SITE_GLOBAL ?>handbook/费用审批人使用教程.pdf">在线查阅《费用审批人使用手册》</a></td>
-				<td class="taC"><a href="<?= WEB_SITE_GLOBAL ?>handbook/费用审批人使用教程.docx">点击下载《费用审批人使用手册》</a></td>
-			</tr>
-			</tbody>
-		</table>
-		<table class="table table-bordered table-condensed">
-			<tbody>
-			<tr>
-				<th class="taC" width="100">费用执行人</th>
-				<td class="taC"><a target="_Blank" href="<?= WEB_SITE_GLOBAL ?>handbook/费用执行人使用教程.pdf">在线查阅《费用执行人使用手册》</a></td>
-				<td class="taC"><a href="<?= WEB_SITE_GLOBAL ?>handbook/费用执行人使用教程.docx">点击下载《费用执行人使用手册》</a></td>
-			</tr>
-			</tbody>
-		</table>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+		    <div class="modal-header">
+		    <h3>欢迎使用费用管理（原报销单）</h3>
+		    </div>
+		    <div class="modal-body saeaList">
+		    	<p style="font-size:18px">请查阅以下文档，了解新的费用管理</p>
+		    	<br>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC colRed" width="100">费用管理简介<br>（必读）</th>
+						<td class="taC">
+						<a target="_Blank" href="<?= WEB_SITE_GLOBAL ?>handbook/CLD费用管理简介.pdf">在线查阅《CLD费用管理简介》</a>
+						
+						</td>
+						<td class="taC"><a href="<?= WEB_SITE_GLOBAL ?>handbook/CLD费用管理简介.docx">点击下载《CLD费用管理简介》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用申请人</th>
+						<td class="taC"><a target="_Blank" href="<?= WEB_SITE_GLOBAL ?>handbook/费用申请人使用教程.pdf">在线查阅《费用申请人使用手册》</a></td>
+						<td class="taC"><a href="<?= WEB_SITE_GLOBAL ?>handbook/费用申请人使用教程.docx">点击下载《费用申请人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用审批人</th>
+						<td class="taC"><a target="_Blank" href="<?= WEB_SITE_GLOBAL ?>handbook/费用审批人使用教程.pdf">在线查阅《费用审批人使用手册》</a></td>
+						<td class="taC"><a href="<?= WEB_SITE_GLOBAL ?>handbook/费用审批人使用教程.docx">点击下载《费用审批人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用执行人</th>
+						<td class="taC"><a target="_Blank" href="<?= WEB_SITE_GLOBAL ?>handbook/费用执行人使用教程.pdf">在线查阅《费用执行人使用手册》</a></td>
+						<td class="taC"><a href="<?= WEB_SITE_GLOBAL ?>handbook/费用执行人使用教程.docx">点击下载《费用执行人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+		    </div>
+			<div class="modal-footer">
+			    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+			</div>
+		</div>
 	</div>
-			</div></div>
 </div>
     <!--邮寄-->			
 <script type="text/javascript">autoFlashHeight();</script>		
-			<script type="text/javascript">$('#welcome').modal('show')</script>
+			<!--<script type="text/javascript">$('#welcome').modal('show')</script>-->
 
 </body>

protected/view/lock_count.html

@@ -23,7 +23,7 @@
 				<a class="now" href="#">使用统计</a>
 				<div class="searchItem"><input type="text" placeholder="输入锁号进行搜索"><input type="button" class="subBtn" value="搜索"><input value="新锁" class="subBtn add" type="button" onclick="javascrtpt:window.location.href='admin-addlock.html'"></div>
 			</div>
-	  		<div class="lockDatabase fL">
+	  		<div class="lockDatabase fL autoHeight">
 	  			<table class="table table-bordered table-condensed table-hover" style="margin:5px">
 					<thead>
 					<tr>

protected/viewc/admin/approvalExpenses.php

@@ -152,7 +152,7 @@
 	  							
 	  							<?php echo $data['page']['page']; ?>
 	  							
-	  							<?php if( $data['page']['on_page']<3 && $data['page']['total_page']>1 ): ?>
+	  							<?php if( $data['page']['on_page']<3 && $data['page']['total_page']>5 ): ?>
 	  							<li><a href="/approvalExpenses/0/4" >4</a></li>
 	  							<li><a href="/approvalExpenses/0/5" >5</a></li>
 	  							<?php endif; ?>

protected/viewc/admin/invoiceApproval.php

@@ -47,7 +47,7 @@
                                     </td>
                                     <td><?php echo $v1['categoryName']; ?><?php echo $v1['userName']; ?> <?php echo $v1['date']; ?></td>
                                     <td></td>
-                                    <td><a class="button btn-block" href="invoice-approval-detail.html" >审批开票</a></td>
+                                    <td><a class="button btn-block" href="/invoiceDetail/<?php echo $v1['iid']; ?>.html" >审批开票</a></td>
                                 </tr>
                                 <?php endforeach; ?>
                                 

protected/viewc/admin/receipt_menu.php

@@ -18,6 +18,64 @@
 						<?php endif; ?>
 						
 						<?php endif; ?>
+						<li class="topLine"><a href="#welcome" data-toggle="modal">使用帮助</a></li>
+
+				</ul>
+						<!--弹出邮寄-->
+<div class="modal fade" id="welcome">
+	<div class="modal-dialog">
+		<div class="modal-content">
+		    <div class="modal-header">
+		    <h3>欢迎使用费用管理（原报销单）</h3>
+		    </div>
+		    <div class="modal-body saeaList">
+		    	<p style="font-size:18px">请查阅以下文档，了解新的费用管理</p>
+		    	<br>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC colRed" width="100">费用管理简介<br>（必读）</th>
+						<td class="taC">
+						<a target="_Blank" href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/CLD费用管理简介.pdf">在线查阅《CLD费用管理简介》</a>
 						
-						
-				</ul>
+						</td>
+						<td class="taC"><a href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/CLD费用管理简介.docx">点击下载《CLD费用管理简介》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用申请人</th>
+						<td class="taC"><a target="_Blank" href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用申请人使用教程.pdf">在线查阅《费用申请人使用手册》</a></td>
+						<td class="taC"><a href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用申请人使用教程.docx">点击下载《费用申请人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用审批人</th>
+						<td class="taC"><a target="_Blank" href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用审批人使用教程.pdf">在线查阅《费用审批人使用手册》</a></td>
+						<td class="taC"><a href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用审批人使用教程.docx">点击下载《费用审批人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用执行人</th>
+						<td class="taC"><a target="_Blank" href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用执行人使用教程.pdf">在线查阅《费用执行人使用手册》</a></td>
+						<td class="taC"><a href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用执行人使用教程.docx">点击下载《费用执行人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+		    </div>
+			<div class="modal-footer">
+			    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+			</div>
+		</div>
+	</div>
+</div>
+    <!--邮寄-->	
+						

protected/viewc/admin/saeaBorad.php

@@ -131,59 +131,60 @@
 <div class="modal fade" id="welcome">
 	<div class="modal-dialog">
 		<div class="modal-content">
-    <div class="modal-header">
-    <h3>欢迎使用费用管理（原报销单）</h3>
-    </div>
-    <div class="modal-body saeaList">
-    	<p style="font-size:18px">请查阅以下文档，了解新的费用管理</p>
-    	<br>
-		<table class="table table-bordered table-condensed">
-			<tbody>
-			<tr>
-				<th class="taC colRed" width="100">费用管理简介<br>（必读）</th>
-				<td class="taC">
-				<a target="_Blank" href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/CLD费用管理简介.pdf">在线查阅《CLD费用管理简介》</a>
-				
-				</td>
-				<td class="taC"><a href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/CLD费用管理简介.docx">点击下载《CLD费用管理简介》</a></td>
-			</tr>
-			</tbody>
-		</table>
-		<table class="table table-bordered table-condensed">
-			<tbody>
-			<tr>
-				<th class="taC" width="100">费用申请人</th>
-				<td class="taC"><a target="_Blank" href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用申请人使用教程.pdf">在线查阅《费用申请人使用手册》</a></td>
-				<td class="taC"><a href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用申请人使用教程.docx">点击下载《费用申请人使用手册》</a></td>
-			</tr>
-			</tbody>
-		</table>
-		<table class="table table-bordered table-condensed">
-			<tbody>
-			<tr>
-				<th class="taC" width="100">费用审批人</th>
-				<td class="taC"><a target="_Blank" href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用审批人使用教程.pdf">在线查阅《费用审批人使用手册》</a></td>
-				<td class="taC"><a href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用审批人使用教程.docx">点击下载《费用审批人使用手册》</a></td>
-			</tr>
-			</tbody>
-		</table>
-		<table class="table table-bordered table-condensed">
-			<tbody>
-			<tr>
-				<th class="taC" width="100">费用执行人</th>
-				<td class="taC"><a target="_Blank" href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用执行人使用教程.pdf">在线查阅《费用执行人使用手册》</a></td>
-				<td class="taC"><a href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用执行人使用教程.docx">点击下载《费用执行人使用手册》</a></td>
-			</tr>
-			</tbody>
-		</table>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+		    <div class="modal-header">
+		    <h3>欢迎使用费用管理（原报销单）</h3>
+		    </div>
+		    <div class="modal-body saeaList">
+		    	<p style="font-size:18px">请查阅以下文档，了解新的费用管理</p>
+		    	<br>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC colRed" width="100">费用管理简介<br>（必读）</th>
+						<td class="taC">
+						<a target="_Blank" href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/CLD费用管理简介.pdf">在线查阅《CLD费用管理简介》</a>
+						
+						</td>
+						<td class="taC"><a href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/CLD费用管理简介.docx">点击下载《CLD费用管理简介》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用申请人</th>
+						<td class="taC"><a target="_Blank" href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用申请人使用教程.pdf">在线查阅《费用申请人使用手册》</a></td>
+						<td class="taC"><a href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用申请人使用教程.docx">点击下载《费用申请人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用审批人</th>
+						<td class="taC"><a target="_Blank" href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用审批人使用教程.pdf">在线查阅《费用审批人使用手册》</a></td>
+						<td class="taC"><a href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用审批人使用教程.docx">点击下载《费用审批人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用执行人</th>
+						<td class="taC"><a target="_Blank" href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用执行人使用教程.pdf">在线查阅《费用执行人使用手册》</a></td>
+						<td class="taC"><a href="<?php echo  WEB_SITE_GLOBAL  ?>handbook/费用执行人使用教程.docx">点击下载《费用执行人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+		    </div>
+			<div class="modal-footer">
+			    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+			</div>
+		</div>
 	</div>
-			</div></div>
 </div>
     <!--邮寄-->			
 <script type="text/javascript">autoFlashHeight();</script>		
-			<script type="text/javascript">$('#welcome').modal('show')</script>
+			<!--<script type="text/javascript">$('#welcome').modal('show')</script>-->
 
 </body>