Merge branch 'master' of http://192.168.1.12:3000/caipin/cld

protected/controller/InvoiceController.php

@@ -121,47 +121,58 @@ class InvoiceController extends DooController {
 					'where' => 'cid=' . $cid,
 					'asArray' => true 
 			) );
-			$invoiceManageDetail = $invoiceManage->getOne ( array (
-					'SELECT' => 'title',
-					'where' => 'mold="发票审批"',
-					'asArray' => true 
-			) );
 			
-			$invoice->cid = $cid;
-			$invoice->categoryName = $categoryDetil ['title'];
-			$invoice->invoiceElement = $invoiceElement;
-			$invoice->invoicePrice = $invoicePrice;
+			$invoiceManageList = $invoiceManage->getInvoiceByAll ();
+			$invoiceManageDetail = $invoiceManage->getInvoiceByMold ( "发票审批" );
 			
-			$invoice->invoiceType = $invoiceType;
-			if ($invoiceType == 0)
-				$invoice->invoiceTitle = $invoiceTitle;
-			elseif ($invoiceType == 1) {
-				$invoice->invoiceCompany = $invoiceCompany;
-				$invoice->TIN = $TIN;
-				$invoice->address = $address;
-				$invoice->phone = $phone;
-				$invoice->bank = $bank;
-				$invoice->bankAccount = $bankAccount;
+			$moldManage = array ();
+			foreach ( $invoiceManageList as $key => $value ) {
+				if ($value ['mold'] == '发票打印')
+					$moldManage [$value ['mold']] = $value ['staffList'];
 			}
 			
-			$invoice->doPost = $doPost;
+			$item = array (
+					'cid' => $cid,
+					'categoryName' => $categoryDetil ['title'],
+					'invoiceElement' => $invoiceElement,
+					'invoicePrice' => $invoicePrice,
+					'invoiceType' => $invoiceType,
+					'doPost' => $doPost,
+					'status' => 1,
+					'invoiceSerial' => "#F" . date ( "Ymd" ) . mt_rand ( 1000, 9999 ),
+					'date' => date ( "Y-m-d H:i:s" ),
+					'updateTime' => date ( "Y-m-d H:i:s" ),
+					'sid' => $this->staff [0] ['sid'],
+					'userName' => $this->staff [0] ['username'],
+					'invoiceManage' => $invoiceManageDetail ['staff'],
+					'pendingApprovals' => $invoiceManageDetail ['staffList'] [0] [0],
+					'moldManage' => json_encode ( $moldManage ),
+					'remark' => $remark 
+			);
+			if ($invoiceType == 0)
+				$item += array (
+						'invoiceTitle' => $invoiceTitle 
+				);
+			else {
+				$item += array (
+						'invoiceCompany' => $invoiceCompany,
+						'TIN' => $TIN,
+						'address' => $address,
+						'phone' => $phone,
+						'bank' => $bank,
+						'bankAccount' => $bankAccount 
+				);
+			}
 			if ($doPost == 1) {
-				$invoice->recipients = $recipients;
-				$invoice->recipientsPhone = $recipientsPhone;
-				$invoice->recipientsAddress = $recipientsAddress;
-				$invoice->mailItems = $mailItems;
+				$item += array (
+						'recipients' => $recipients,
+						'recipientsPhone' => $recipientsPhone,
+						'recipientsAddress' => $recipientsAddress,
+						'mailItems' => $mailItems 
+				);
 			}
-			$invoice->status = 1;
-			$invoice->invoiceSerial = "#F" . date ( "Ymd" ) . mt_rand ( 1000, 9999 );
-			$invoice->date = date ( "Y-m-d H:i:s" );
-			$invoice->updateTime = 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->remark = $remark;
-			$iid = $invoice->insert ();
+			
+			$iid = $invoice->addInvoice ( $item );
 			
 			$item = array (
 					'date' => date ( "Y-m-d H:i:s" ),
@@ -375,17 +386,8 @@ class InvoiceController extends DooController {
 		Doo::loadModel ( 'staff' );
 		$staff = new staff ();
 		
-		$toPrint = $invoice->find ( array (
-				'where' => 'status=2 ',
-				'desc' => 'iid',
-				'asArray' => true 
-		) );
-		
-		$printed = $invoice->find ( array (
-				'where' => 'status=5 ',
-				'desc' => 'iid',
-				'asArray' => true 
-		) );
+		$toPrint = $invoice->getPrintInvoiceByManage ( $this->staff [0] ['sid'], 2 );
+		$printed = $invoice->getPrintInvoiceByManage ( $this->staff [0] ['sid'], 5 );
 		
 		foreach ( $toPrint as $key => $value ) {
 			$toPrint [$key] ['iidKey'] = $XDeode->encode ( $value ['iid'] );
@@ -448,10 +450,9 @@ class InvoiceController extends DooController {
 		Doo::loadModel ( 'invoiceOperationLog' );
 		$invoiceOperationLog = new invoiceOperationLog ();
 		
-		$invoiceDetail = $invoice->getOne ( array (
-				'where' => 'status=2 and iid=' . $iid,
-				'asArray' => true 
-		) );
+		$invoiceDetail = $invoice->getPrintInvoiceByManage ( $this->staff [0] ['sid'], 2, $iid );
+		if (empty ( $invoiceDetail ))
+			die ( 'illegal request' );
 		
 		$invoiceOperationLogList = $invoiceOperationLog->getInvoiceOperationLogByIid ( $iid );
 		

protected/controller/ReceiptController.php

@@ -2228,6 +2228,26 @@ class ReceiptController extends DooController {
 				}
 			}
 
+			//费用执行人相关数据
+			$executeCopy=json_decode($value['executeCopy'],true);
+			$executeStaff=json_decode($value['executeStaff'],true);
+			foreach ($executeCopy as $k=>$v){
+				$executeCopy[$k]['date']='';
+				$executeCopy[$k]['opinion']='';
+				$executeCopy[$k]['status']='';
+				if (!empty($executeStaff))
+				foreach ($executeStaff as $m=>$u){
+					if ($v[0]==$m){
+						$executeCopy[$k]['date']=$u['date'];
+						$executeCopy[$k]['opinion']=$u['opinion'];
+						$executeCopy[$k]['status']=$u['status'];
+						break;
+					}
+				}
+				
+			}
+			
+			$receiptList[$key]['executeCopy']=$executeCopy;
 			$receiptList[$key]['verifyList']=$verifyList;
 			$receiptList[$key]['staffDetail']=$staff->getOne(array('where'=>'sid='.$value['staff'],'asArray'=>true));
 			$receiptList[$key]['button']=$button;
@@ -2744,6 +2764,26 @@ $verifyDetail=$verify->find(array('where'=>' (staff not like "%\"'.$this->staff[
 				}
 			}
 
+			//费用执行人相关数据
+			$executeCopy=json_decode($value['executeCopy'],true);
+			$executeStaff=json_decode($value['executeStaff'],true);
+			foreach ($executeCopy as $k=>$v){
+				$executeCopy[$k]['date']='';
+				$executeCopy[$k]['opinion']='';
+				$executeCopy[$k]['status']='';
+				if (!empty($executeStaff))
+					foreach ($executeStaff as $m=>$u){
+						if ($v[0]==$m){
+							$executeCopy[$k]['date']=$u['date'];
+							$executeCopy[$k]['opinion']=$u['opinion'];
+							$executeCopy[$k]['status']=$u['status'];
+							break;
+						}
+				}
+			
+			}
+			$receiptList[$key]['executeCopy']=$executeCopy;
+			
 			$receiptList[$key]['verifyList']=$verifyList;
 			$receiptList[$key]['staffDetail']=$staff->getOne(array('where'=>'sid='.$value['staff'],'asArray'=>true));
 			$receiptList[$key]['button']=$button;
@@ -2752,6 +2792,9 @@ $verifyDetail=$verify->find(array('where'=>' (staff not like "%\"'.$this->staff[
 			$receiptList[$key]['loanSumCN']=$this->num_to_rmb($value['loanSum']);
 			
 		}
+		
+		//print_r($receiptList);
+		
 		//获取审批日志
 		Doo::loadModel('receiptLog');
 		$receiptLog=new receiptLog();
@@ -3577,14 +3620,21 @@ $verifyDetail=$verify->find(array('where'=>' (staff not like "%\"'.$this->staff[
 
 			
 			//检测编辑状态
-			$verifyList=$verify->getOne(array('where'=>'vid='.$value['verify'],'asArray'=>true));
+			if ($value['status']==3||$value['status']==1||$value['status']==9){
+				$verifyList['staff']=$value['verifyBreakup'];
+			}else
+				$verifyList=$verify->getOne(array('where'=>'vid='.$value['verify'],'asArray'=>true));
+				
+			
 			$verifyList=json_decode($verifyList['staff'],true);//status opinion
 			
 			$verifyStaff=json_decode($value['verifyStaff'],true);
 
 			Doo::loadModel('role');
 			$role=new role();
-				
+			
+			if ($verifyList==NULL)
+				$verifyList=array();
 			$flag=true;$roleKey=0;$endStaffArray=array();$roleArrayCopy=array();
 			foreach ($verifyList as $k=>$v){
 				//init verifyStaff
@@ -3635,12 +3685,15 @@ $verifyDetail=$verify->find(array('where'=>' (staff not like "%\"'.$this->staff[
 						}
 					}
 					
-					
 					$endStaffArray=end($verifyStaff);
 					if (isset($endStaffArray['ROLE'])){
 						
 					}else{
-
+//						$endKey=key($verifyStaff);
+//						if ($v[0]==$endStaffArray['nextStaff']&&$endStaffArray['nextStaff']==$this->staff[0]['sid']){
+//							$button=4;
+//							$verifyList[$k]['status']=4;
+//						}
 					}
 				}
 			}
@@ -3699,10 +3752,13 @@ $verifyDetail=$verify->find(array('where'=>' (staff not like "%\"'.$this->staff[
 					}
 				}
 			}
+
+$receiptList[$key]['verifyList']=$verifyList;
+			
 			
 			$receiptList[$key]['executeList']=$executeList;
 
-			$receiptList[$key]['verifyList']=$verifyList;
+			
 			$receiptList[$key]['staffDetail']=$staff->getOne(array('where'=>'sid='.$value['staff'],'asArray'=>true));
 			$receiptList[$key]['button2']=$button2;
 			

protected/model/invoice.php

@@ -44,7 +44,7 @@ class invoice extends DooModel {
 	 */
 	public $invoicePrice;
 	/**
-	 * 管理组人员：
+	 * 管理组人员：发票打印，
 	 * @var unknown
 	 */
 	public $moldManage;
@@ -159,7 +159,7 @@ class invoice extends DooModel {
 	 */
 	public $updateTime;
 	/**
-	 * 
+	 *
 	 * @var date $printTime 打印时间
 	 */
 	public $printTime;
@@ -195,8 +195,8 @@ class invoice extends DooModel {
 			'sid',
 			'userName',
 			'date',
-			'updateTime' ,
-			'printTime'
+			'updateTime',
+			'printTime' 
 	);
 	public function getInvoiceByIid($iid = 0) {
 	}
@@ -214,6 +214,21 @@ class invoice extends DooModel {
 		return $detail;
 	}
 	/**
+	 * 添加一个发票并进入审批状态
+	 * @param array $item 发票相关数据
+	 * @return number 返回发票ID
+	 */
+	public function addInvoice($item = array()) {
+		$lid = 0;
+		if (is_array ( $item ) && ! empty ( $item )) {
+			foreach ( $item as $key => $value ) {
+				$this->$key = $value;
+			}
+			$lid = $this->insert ();
+		}
+		return $lid;
+	}
+	/**
 	 * 记录发票号并完成打印
 	 * @param array $item 发票号和完成打印状态数据
 	 * @return number 返回发票ID
@@ -229,7 +244,29 @@ class invoice extends DooModel {
 		return $lid;
 	}
 	/**
-	 * 获取待处理发票的数据 其中包括退回`终止
+	 * 根据管理组和发票当前状态获得打印发票数据；其中当iid为空时获取所有发票数据，反之获取1条数据
+	 * @param number $sid 管理组人员ID
+	 * @param number $status 状态 为2时获取可以打印数据，为5时获取已经完成打印数据
+	 * @param number $iid 发票ID
+	 * @return array|array() 返回所有发票数据，当iid有值时返回一条数据
+	 */
+	public function getPrintInvoiceByManage($sid = 0, $status = 0, $iid = 0) {
+		$list = array ();
+		if (! empty ( $sid ) && empty ( $iid ))
+			$list = $this->find ( array (
+					'where' => "status=" . $status . " and moldManage like '%[\"" . $sid . "\",%'",
+					'desc' => 'iid',
+					'asArray' => TRUE 
+			) );
+		elseif (! empty ( $sid ) && ! empty ( $iid ))
+			$list = $this->getOne ( array (
+					'where' => "status=" . $status . " and moldManage like '%[\"" . $sid . "\",%' and iid=" . $iid,
+					'asArray' => TRUE 
+			) );
+		return $list;
+	}
+	/**
+	 * 待修改 获取待处理发票的数据 其中包括退回`终止
 	 * @return unknown
 	 */
 	public function getPendingByInvoice() {
@@ -241,12 +278,12 @@ class invoice extends DooModel {
 	}
 	/**
 	 * 获取需要邮寄的发票
-	 * @return array 
+	 * @return array
 	 */
-	public function getPostByInvoice(){
+	public function getPostByInvoice() {
 		$list = $this->find ( array (
 				'where' => "status=5 and doPost=1",
-				'asArray' => TRUE
+				'asArray' => TRUE 
 		) );
 		return $list;
 	}

protected/model/invoiceManage.php

@@ -41,10 +41,23 @@ class invoiceManage extends DooModel {
 					'where' => 'mold="' . $mold . '"',
 					'asArray' => TRUE 
 			) );
-			$detail ['staff'] = json_decode ( $detail ['staff'] );
+			$detail ['staffList'] = json_decode ( $detail ['staff'],true );
 		}
 		return $detail;
 	}
+	/**
+	 * 获取所有管理组数据
+	 * @return array|array() 该管理组相关数据,人员数据数组化
+	 */
+	public function getInvoiceByAll(){
+		$lsit=$this->find(array (
+					'asArray' => TRUE 
+			));
+		foreach ($lsit as $key=>$value){
+			$lsit[$key]['staffList']=json_decode ( $value ['staff'],true );
+		}
+		return $lsit;
+	}
 }
 
 // ?>

protected/plugin/TemplateTag.php

@@ -30,7 +30,7 @@ function isInvoiceMoldShow($sid = 0, $mold = '') {
 		$invoiceManage = new invoiceManage ();
 		$imList = $invoiceManage->getInvoiceByMold($mold);
 		$list=array();
-		foreach ($imList['staff'] as $k=>$v){
+		foreach ($imList['staffList'] as $k=>$v){
 			array_push($list, $v[0]);
 		}
 		$fileInvoice = file_get_contents ( "protected/config/invoice/invoice.ini" );

protected/view/admin/expensesCollect.html

@@ -24,15 +24,6 @@
 				<div class="saeaList ">
 	  			<!-- loop receiptList -->
 	  			
-	  				
-	  				
-	  				
-	  				
-	  				
-	  				
-	  				
-	  				
-	  				
 	  				<!-- if {{receiptList' value.Rtype}}==1 -->
 	  			
 	  				<div class="entry loan-list">
@@ -46,9 +37,6 @@
 	  				<div class="seal close"></div>
 	  				<!-- endif -->
 	  				
-	  				
-	  				
-	  			
 	  				<div class="seTable">
 	  				
 	  					<!-- if {{receiptList' value.loanRid}}!=0 and !empty({{receiptList' value.accountItem}}) -->
@@ -133,12 +121,8 @@
 	  					
 	  					<!-- endif -->
 	  				
-						
-						
 					</div>
 	  			
-	  			
-	  			
 	  			<div class="seCensor loan-censor">
 	  					<div class="title">
 	  					{{receiptDetail' value.receiptOrder}}
@@ -173,7 +157,17 @@
 		  						
 		  						
 		  						<!-- endloop -->
-		  						
+		  						<!-- loop receiptDetail' value.executeCopy -->
+	  							<li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
+			  							<div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg" width="32"></div>
+			  							
+			  							<div class="comment">
+			  								<p class="colGray"><span class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.1}}（费用执行）</p>
+			  								<p>{{receiptDetail' value' value.opinion}}</p>
+			  							</div>
+			  							
+			  						</li>
+			  					<!-- endloop -->
 	  						
 	  					</ul>
 	  					<!-- if {{receiptDetail'  value.status}}==4 -->
@@ -259,8 +253,17 @@
 		  						
 		  						
 		  						<!-- endloop -->
-		  						
-	  						
+		  						<!-- loop receiptDetail' value.executeCopy -->
+	  							<li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
+			  							<div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg" width="32"></div>
+			  							
+			  							<div class="comment">
+			  								<p class="colGray"><span class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.1}}（费用执行）</p>
+			  								<p>{{receiptDetail' value' value.opinion}}</p>
+			  							</div>
+			  							
+			  						</li>
+			  					<!-- endloop -->
 	  					</ul>
 	  					<!-- if {{receiptDetail'  value.status}}==4 -->
 	  					<div class="reportButton btnList">
@@ -361,7 +364,17 @@
 		  						
 		  						
 		  						<!-- endloop -->
-		  						
+		  						<!-- loop receiptDetail' value.executeCopy -->
+	  							<li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
+			  							<div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg" width="32"></div>
+			  							
+			  							<div class="comment">
+			  								<p class="colGray"><span class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.1}}（费用执行）</p>
+			  								<p>{{receiptDetail' value' value.opinion}}</p>
+			  							</div>
+			  							
+			  						</li>
+			  					<!-- endloop -->
 	  						
 	  					</ul>
 	  					<!-- if {{receiptDetail'  value.status}}==4 -->

protected/view/admin/expensesDoc.html

@@ -32,16 +32,6 @@
 				
 				<div class="saeaList ">
 	  			<!-- loop receiptList -->
-	  			
-	  				
-	  				
-	  				
-	  				
-	  				
-	  				
-	  				
-	  				
-	  				
 	  				<!-- if {{receiptList' value.Rtype}}==1 -->
 	  			
 	  				<div class="entry loan-list">
@@ -191,6 +181,18 @@
 		  						<!-- endloop -->
 		  						<!-- endif -->
 		  						
+		  						<!-- loop receiptDetail' value.executeCopy -->
+	  							<li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
+			  							<div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg" width="32"></div>
+			  							
+			  							<div class="comment">
+			  								<p class="colGray"><span class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.1}}（费用执行）</p>
+			  								<p>{{receiptDetail' value' value.opinion}}</p>
+			  							</div>
+			  							
+			  						</li>
+			  					<!-- endloop -->
+		  						
 	  					</ul>
 	  					<!-- if {{receiptDetail'  value.status}}==4 -->
 	  					<!-- if {{receiptDetail'  value.staff}}=={{staff.0.sid}} -->
@@ -288,6 +290,17 @@
 		  						
 		  						<!-- endloop -->
 		  						<!-- endif -->
+		  						<!-- loop receiptDetail' value.executeCopy -->
+	  							<li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
+			  							<div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg" width="32"></div>
+			  							
+			  							<div class="comment">
+			  								<p class="colGray"><span class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.1}}（费用执行）</p>
+			  								<p>{{receiptDetail' value' value.opinion}}</p>
+			  							</div>
+			  							
+			  						</li>
+			  					<!-- endloop -->
 	  						
 	  					</ul>
 	  					<!-- if {{receiptDetail'  value.status}}==4 -->
@@ -403,7 +416,17 @@
 		  						
 		  						<!-- endloop -->
 		  						<!-- endif -->
-		  						
+		  						<!-- loop receiptDetail' value.executeCopy -->
+	  							<li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
+			  							<div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg" width="32"></div>
+			  							
+			  							<div class="comment">
+			  								<p class="colGray"><span class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.1}}（费用执行）</p>
+			  								<p>{{receiptDetail' value' value.opinion}}</p>
+			  							</div>
+			  							
+			  						</li>
+			  					<!-- endloop -->
 	  						
 	  					</ul>
 	  					<!-- if {{receiptDetail'  value.status}}==4 -->

protected/view/admin/implement.html

@@ -151,13 +151,12 @@
 		  							
 		  						</li>
 		  						
+		  						<!-- loop receiptDetail' value.verifyList -->
 		  						
 		  						
 		  						
-		  						<!-- loop receiptDetail' value.verifyList -->
-		  						
-			  						<li style="display:none" <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
-			  							<div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg"></div>
+			  						<li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
+			  							<div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg" width="32"></div>
 			  							
 			  							<div class="comment">
 			  								<p class="colGray"><span class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.1}}<!-- if isset({{receiptDetail' value' value.rolename}}) --> （{{receiptDetail' value' value.rolename}}） <!-- endif --></p>
@@ -165,8 +164,11 @@
 			  							</div>
 			  							
 			  						</li>
+		  						
+		  						
 		  						<!-- endloop -->
 		  						
+		  						
 		  						<!-- loop receiptDetail' value.executeList -->
 		  						
 		  						<li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
@@ -174,13 +176,13 @@
 										
 										<!-- if {{receiptDetail' value' value.status}}==4 -->
 			  							<div class="comment">
-			  								<p class="colGray">{{receiptDetail' value' value.1}}</p>
+			  								<p class="colGray">{{receiptDetail' value' value.1}}（费用执行）</p>
 			  								<p><textarea name="opinion" id="opinion_{{receiptList' value.rid}}" placeholder="填写审批意见（可选）"></textarea></p>
 			  							</div>
 			  							<!-- else -->
 			  							
 			  							<div class="comment">
-			  								<p class="colGray">{{receiptDetail' value' value.1}}<span class="fR">{{receiptDetail' value' value.date}}</span></p>
+			  								<p class="colGray">{{receiptDetail' value' value.1}}（费用执行）<span class="fR">{{receiptDetail' value' value.date}}</span></p>
 			  								<p>{{receiptDetail' value' value.opinion}}</p>
 			  							</div>
 			  							<!-- endif -->
@@ -258,15 +260,12 @@
 		  							
 		  						</li>
 		  						
-		  						
-		  						
-		  						
 		  						<!-- loop receiptDetail' value.verifyList -->
 		  						
 		  						
 		  						
-			  						<li style="display:none" <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
-			  							<div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg"></div>
+			  						<li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
+			  							<div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg" width="32"></div>
 			  							
 			  							<div class="comment">
 			  								<p class="colGray"><span class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.1}}<!-- if isset({{receiptDetail' value' value.rolename}}) --> （{{receiptDetail' value' value.rolename}}） <!-- endif --></p>
@@ -278,6 +277,8 @@
 		  						
 		  						<!-- endloop -->
 		  						
+		  						
+		  						
 		  						<!-- loop receiptDetail' value.executeList -->
 		  						
 		  						<li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
@@ -285,13 +286,13 @@
 										
 										<!-- if {{receiptDetail' value' value.status}}==4 -->
 			  							<div class="comment">
-			  								<p class="colGray">{{receiptDetail' value' value.1}}</p>
+			  								<p class="colGray">{{receiptDetail' value' value.1}}（费用执行）</p>
 			  								<p><textarea name="opinion" id="opinion_{{receiptList' value.rid}}" placeholder="填写审批意见（可选）"></textarea></p>
 			  							</div>
 			  							<!-- else -->
 			  							
 			  							<div class="comment">
-			  								<p class="colGray">{{receiptDetail' value' value.1}}<span class="fR">{{receiptDetail' value' value.date}}</span></p>
+			  								<p class="colGray">{{receiptDetail' value' value.1}}（费用执行）<span class="fR">{{receiptDetail' value' value.date}}</span></p>
 			  								<p>{{receiptDetail' value' value.opinion}}</p>
 			  							</div>
 			  							<!-- endif -->
@@ -391,14 +392,12 @@
 		  						</li>
 		  						
 		  						
-		  						
-		  						
 		  						<!-- loop receiptDetail' value.verifyList -->
 		  						
 		  						
 		  						
-			  						<li style="display:none" <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
-			  							<div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg"></div>
+			  						<li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
+			  							<div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg" width="32"></div>
 			  							
 			  							<div class="comment">
 			  								<p class="colGray"><span class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.1}}<!-- if isset({{receiptDetail' value' value.rolename}}) --> （{{receiptDetail' value' value.rolename}}） <!-- endif --></p>
@@ -417,13 +416,13 @@
 										
 										<!-- if {{receiptDetail' value' value.status}}==4 -->
 			  							<div class="comment">
-			  								<p class="colGray">{{receiptDetail' value' value.1}}</p>
+			  								<p class="colGray">{{receiptDetail' value' value.1}}（费用执行）</p>
 			  								<p><textarea name="opinion" id="opinion_{{receiptList' value.rid}}" placeholder="填写审批意见（可选）"></textarea></p>
 			  							</div>
 			  							<!-- else -->
 			  							
 			  							<div class="comment">
-			  								<p class="colGray">{{receiptDetail' value' value.1}}<span class="fR">{{receiptDetail' value' value.date}}</span></p>
+			  								<p class="colGray">{{receiptDetail' value' value.1}}（费用执行）<span class="fR">{{receiptDetail' value' value.date}}</span></p>
 			  								<p>{{receiptDetail' value' value.opinion}}</p>
 			  							</div>
 			  							<!-- endif -->