费用金额和流水问题

global/js/index.js

@@ -1256,7 +1256,7 @@ function clientEdit(cid){
 				$html+='<tr><td colspan="3"><a href="javascript:void(0)" onclick="EclientInfo('+cid+')" class="button">确定</a><span id="load"></span></td><td ></td></tr></tbody></table></div></div>';
 				
 				$html+='<div class="contactPanel"><table><tbody>';
-				$html+='<tr><th>单位全称</th><td colspan="3"><a href="javascript:void(0)" onclick="getCompany('+data.html.companyInfo.cid+')" class="cname">'+data.html.companyInfo.companyname+'</a><div class="fR"><a href="javascript:void(0)" class="icon- edit" onclick="editByCompany('+data.html.companyInfo.cid+')" >I</a>|<a href="javascript:void(0)"   onclick="changeCompany('+data.html.cid+')" class="icon- replace">J</a></div></td></tr>';
+				$html+='<tr><th>单位全称</th><td colspan="3"><a href="javascript:void(0)" onclick="getCompany(\''+data.html.companyInfo.cidKey+'\')" class="cname">'+data.html.companyInfo.companyname+'</a><div class="fR"><a href="javascript:void(0)" class="icon- edit" onclick="editByCompany('+data.html.companyInfo.cid+')" >I</a>|<a href="javascript:void(0)"   onclick="changeCompany('+data.html.cid+')" class="icon- replace">J</a></div></td></tr>';
 				$html+='<tr><th>单位地区</th><td colspan="3"><span>'+data.html.companyInfo.local+'</span></td></tr>';
 				$html+='<tr><th>单位性质</th><td colspan="3">'+data.html.companyInfo.nature+'</td></tr>';
 				$html+='<tr><th>单位地址</th><td colspan="3">'+data.html.companyInfo.address+'</td></tr>';

protected/controller/InvoiceController.php

@@ -72,7 +72,7 @@ class InvoiceController extends DooController {
 			
 			$icm = $invoiceCategoryManage->getInvoiceCMByStaff ( $sid );
 			if (empty ( $icm ))
-				die ( 'illegal request' );
+				die ( 'illegal request-iacd' );
 		}
 		// 单独判断应收款访问权限
 		if ($action == 'invoiceAggregateCompanyDetail') {
@@ -3542,8 +3542,10 @@ class InvoiceController extends DooController {
 			Doo::db ()->beginTransaction ();
 			
 			$bindStatus = 0;
-			if ($receivablesPrice <= $invoiceDetail ['invoicePrice'])
+			if ($receivablesPrice <= $invoiceDetail ['invoicePrice']){
 				$bindStatus = 1;
+			}
+				
 			
 			$titleMark = $invoiceDetail ['invoiceTitle'];
 			if (! empty ( $invoiceDetail ['invoiceCompany'] ))

protected/controller/MainController.php

@@ -4611,7 +4611,7 @@ class MainController extends DooController {
 		  			<tbody>
 		  			<tr><th>单位全称</th><td colspan="3"><a href="javascript:void(0)" >' . $companyInfo [0] ['companyname'] . '</a></td></tr>
 		  			<tr><th>地区</th><td>' . $companyInfo [0] ['local'] . '</td><th>部门/职位</th><td>' . $clientInfo ['department'] . '/' . $clientInfo ['position'] . '</td></tr>
-		  			<tr><th>传真</th><td>' . $companyInfo [0] ['fax'] . '</td><th>办公室</th><td>' . $companyInfo [0] ['office'] . '</td></tr>
+		  			<tr><th>传真</th><td>' . $companyInfo [0] ['fax'] . '</td><th>办公室</th><td>' . $clientInfo ['office'] . '</td></tr>
 		  			<tr><th>单位地址</th><td colspan="3">' . $companyInfo [0] ['address'] . '</td></tr>
 		  			<tr><th>乘车路线</th><td colspan="3">' . $companyInfo [0] ['ride'] . '</td></tr>
 		  			<tr><th>地标建筑</th><td colspan="3">' . $companyInfo [0] ['landmarks'] . '</td></tr>
@@ -5334,7 +5334,11 @@ class MainController extends DooController {
 					'where' => ' cid=' . $info ['companyid'],
 					'asArray' => true 
 			) );
-			
+
+            Doo::loadClass ( 'XDeode' );
+            $XDeode = new XDeode ( 5 );
+            $cinfo['cidKey']=$XDeode->encode ( $cinfo['cid'] );
+
 			Doo::loadModel ( 'district' );
 			$district = new district ();
 			$districtLv1 = $district->get_lv ( 1 );

protected/controller/ReceiptController.php

@@ -221,6 +221,7 @@ class ReceiptController extends DooController {
 			$receiptDetail [$key] ['category'] = $category ['title'];
 		}
 		// print_r($receiptLogList);
+		
 		Doo::loadModel ( 'RAssist' );
 		$RAssist = new RAssist ();
 		$receiptExtendList=$RAssist->getRAssistBySid($this->staff[0]['sid']);
@@ -2873,7 +2874,7 @@ class ReceiptController extends DooController {
 
             $rtDetail=$receiptTraining->getReceiptTrainingByRtid($rtid);
             $identifyingTotal=$rtDetail['identifyingTotal']+1;
-echo $rtDetail['identifyingTotal'];die;
+
 			$order = array (
 					"\r\n",
 					"\n",
@@ -5058,6 +5059,7 @@ echo $rtDetail['identifyingTotal'];die;
 		$status = $this->get_args ( 'status' ) && is_numeric ( $this->get_args ( 'status' ) ) ? $this->get_args ( 'status' ) : 0;
 		$rid = $this->get_args ( 'rid' ) && is_numeric ( $this->get_args ( 'rid' ) ) ? $this->get_args ( 'rid' ) : 0;
 		$Locate = $this->get_args ( 'Locate' ) && is_numeric ( $this->get_args ( 'Locate' ) ) ? $this->get_args ( 'Locate' ) : 0;
+		
 		$amount = $this->get_args ( 'amount' ) && is_numeric ( $this->get_args ( 'amount' ) ) ? $this->get_args ( 'amount' ) : 0;
 		
 		if (! empty ( $rid )) {
@@ -5341,8 +5343,6 @@ echo $rtDetail['identifyingTotal'];die;
 						// echo $nowStaff;die;
 					} else { // 进入下一个角色或者审批人
 					         
-						// echo str_replace($this->staff[0]['sid'], '', $receiptDetail['nowStaff']);
-					         //
 						$nowStaff = str_replace ( $this->staff [0] ['sid'], '', $receiptDetail ['nowStaff'] );
 						
 						$verifyStaff [$this->staff [0] ['sid'] . '_R'] = array (
@@ -5352,9 +5352,6 @@ echo $rtDetail['identifyingTotal'];die;
 								'nextStaff' => $VS ['nextStaff'],
 								'ROLE' => 1 
 						);
-						
-						// print_r($verifyStaff);
-						// die;
 					}
 					
 					if ($status == 3) {
@@ -5372,16 +5369,10 @@ echo $rtDetail['identifyingTotal'];die;
 					$loanReceipt->nowStaff = $nowStaff;
 					$loanReceipt->verifyStaff = $vStaffString;
 					
-					// die;
-					// }
-					// print_r($verifyStaff);
-					// die;
 				}
 				// print_r($verifyStaff);die;
 			}
 			
-			// print_r($verifyDetail);
-			
 			$roleKey = 0;
 			$roleId = 0;
 			$verifyDetailCopy = array ();
@@ -5473,7 +5464,7 @@ echo $rtDetail['identifyingTotal'];die;
 				$this->setWXMsg ( $rid, 1 );
 			}
 			
-			$receipt->amount = $amount;
+			$receipt->amount = $receiptDetail['sum'];
 			$receipt->update ( array (
 					'where' => ' rid = ' . $rid 
 			) );
@@ -6007,7 +5998,7 @@ echo $rtDetail['identifyingTotal'];die;
 		$data ['wbDetailLoan'] = $wbDetailLoan;
 		
 		
-		//print_r($receiptList);
+		//print_r($wbDetail);
 		
 		$data ['receiptList'] = $receiptList;
 		$data ['memu'] = "receipt";
@@ -10154,7 +10145,8 @@ echo $rtDetail['identifyingTotal'];die;
 			}
 			$wbDetail = $wasteBook->getWateBookByAD ( $accountType, $rid );
 			if (empty($wbDetail)){
-				$receipt->amount = $amount;
+				$rsum=$receiptDetail['sum']-$receiptDetail['loanSum'];
+				$receipt->amount = $rsum;//$amount;
 			}
 			
 			

protected/model/invoice.php

@@ -988,8 +988,19 @@ class invoice extends DooModel {
 		$invoiceReceivables = new invoiceReceivables ();
 		Doo::loadModel ( 'invoiceOperationLog' );
 		$invoiceOperationLog = new invoiceOperationLog ();
+        Doo::loadModel ( 'receipt' );
+        $receipt = new receipt ();
 		
 		foreach ( $list as $key => $value ) {
+		    //培训班结算是否完成
+            $receiptDetail=$receipt->getReceiptByinvoiceTrainId($value['trainId']);
+            $list[$key]['settlementStatus']=false;
+            if (!empty($receiptDetail)){
+                if ($receiptDetail['status']==8||$receiptDetail['status']==9){
+                    $list[$key]['settlementStatus']=true;
+                }
+            }
+            
 			$list [$key] ['count'] = $listCount;
 			$list [$key] ['iidKey'] = $this->authcode ( $value ['iid'], '' );
 			$list [$key] ['iidKeyK'] = $XDeode->encode ( $value ['iid'] );
@@ -1093,7 +1104,8 @@ class invoice extends DooModel {
 			$monthSql = "";
 		else {
 			$month = date ( "m" );
-			$monthSql = " and  Month(date)=" . $month;
+			$year=date('Y');
+			$monthSql = " and  Month(date)=" . $month." and Year(date)=".$year;
 		}
 		
 		// 完成打印

protected/model/invoiceCategoryManage.php

@@ -57,7 +57,7 @@ class invoiceCategoryManage extends DooModel {
 					'where' => 'staff like "%[\"' . $sid . '\",%"',
 					'asArray' => TRUE
 			) );
-	
+	//echo 'staff like "%[\"' . $sid . '\",%"';
 			return $lsit;
 	}
 }

protected/model/invoiceStatistics.php

@@ -292,7 +292,7 @@ class invoiceStatistics extends DooModel {
 // 					GROUP BY staff';
 			$sql = 'select sum(invoicePrice) as invoicePrice,sum(receivablesPrice) as receivablesPrice,sum(accountPrice) as accountPrice ,cid,staff,Month(date) as month
 				from ' . $this->_table . '
-				where date_format(date,"%Y-%m")=' . $month . ' and cid = ' . $cid . '
+				where date_format(date,"%Y-%m")="' . $month . '" and cid = ' . $cid . '
 					GROUP BY staff';
 			//echo $sql;
 		$query = Doo::db ()->query ( $sql );
@@ -343,10 +343,11 @@ class invoiceStatistics extends DooModel {
 			return array ();
 		
 		$month = date ( "m" );
+		$year=date('Y');
 		
 		$sql = 'select sum(invoicePrice) as invoicePrice,sum(receivablesPrice) as receivablesPrice,sum(accountPrice) as accountPrice ,cid,Month(date) as month
 				from ' . $this->_table . '
-				where Month(date)=' . $month . ' and cid = ' . $cid . ' and staff!=0 
+				where Month(date)=' . $month . ' and Year(date)='.$year.' and cid = ' . $cid . ' and staff!=0 
 					GROUP BY cid';
 		$query = Doo::db ()->query ( $sql );
 		//echo $sql;

protected/view/admin/expensesEdi.html

@@ -224,12 +224,27 @@
 	  				
 	  				<!-- endif -->
 	  				<br/>
+	  				<!-- 
 	  				<table class="table table-bordered table-condensed table-hover">
-							<tbody>
-								<tr><th colspan="2" class="taC">确认汇款金额</th></tr>
-								<tr><th>汇款金额（用于生成汇款单）</th><td class="taR" width="200">￥<input placeholder="输入汇款金额" pattern="[0-9]" id="amount" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number"></td></tr>
-							</tbody>
-						</table>
+						<tbody>
+							<tr><th colspan="2" class="taC">确认汇款金额</th></tr>
+							<tr><th>汇款金额（用于生成汇款单）</th>
+							<td class="taR" width="200">
+							￥<input placeholder="输入汇款金额" pattern="[0-9]" id="amount" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number"></td></tr>
+						</tbody>
+					</table>
+					 -->
+			<table class="table table-bordered table-condensed table-hover">
+				<tbody>
+				<tr><th colspan="2" class="taC">费用结算</th></tr>
+				<tr><th>结算结果<br><span class="colGray">("支出"由公司汇出，"收入"提交人需汇款至公司。)</span></th>
+				<td class="taR" width="200"><!-- <span class="colGreen">收入</span> --><span class="colRed">支出</span></td>
+				</tr>
+				<tr><th>汇款金额</th><td class="taR" width="200">￥{{receiptDetail' value.sum}}</td></tr>
+				</tbody>
+			</table>
+					
+					
 	  				</div>
 	  				
 	  				<div class="seCensor loan-censor ">

protected/view/admin/hisImplement.html

@@ -84,7 +84,7 @@
 	  		<div class="saeaList">
 				<div class="entry">
 					<table class="table table-bordered table-condensed">
-						<thead><tr><th width="54" >上报人</th><th width="100" class="taC">费用类型</th><th width="100" class="taC">费用金额金额</th><th width="120" class="taC">费用所在办事处</th><th width="120" class="taC">费用单号</th><th class="taC">费用说明</th><th width="100" class="taC">状态</th><th width="80" class="taC">操作</th></tr></thead>
+						<thead><tr><th width="54" >上报人</th><th width="100" class="taC">费用类型</th><th width="100" class="taC">费用金额</th><th width="120" class="taC">费用所在办事处</th><th width="120" class="taC">费用单号</th><th class="taC">费用说明</th><th width="100" class="taC">状态</th><th width="80" class="taC">操作</th></tr></thead>
 						<tbody>
 						<!-- loop receiptList -->
 						<!-- if {{item}}=="pendImplement" -->

protected/view/admin/implement.html

@@ -239,14 +239,28 @@
 	  				<form action="/receiptTrainImplementWateDo"  method="post" class="nice-validator n-yellow" novalidate="novalidate">
 						<input type="hidden" name="ridKey" value="{{receiptDetail' value.ridKey}}">
 						<input type="hidden" name="actionType" value="NOTRAIN">
+						<input type="hidden" name="expensesType" value="EXPENDITURE">
 						
 						<table class="table table-bordered table-condensed table-hover">
 							<tbody>
 								<tr><th colspan="2" class="taC">确认汇款金额</th></tr>
-								<tr><th>汇款金额（用于生成汇款单）</th><td class="taR" width="220">￥
-									<input name='amount' placeholder="输入汇款金额" pattern="[0-9]" step="1" min="0" class="span2" type="number">
+								
+								<tr>
+								<th>流水类型<br><span class="colGray">("支出"由公司汇出，"收入"提交人需汇款至公司。)</span></th>
+								<td class="taR" width="200">
+								<!-- if {{receiptDetail' value.amount}}>=0 -->
+								<span class="colRed">支出</span>
+								<!-- else -->
+								<span class="colGreen">收入</span>
+								<!-- endif -->
+								</td>
+								</tr>
+								
+								<tr><th>汇款金额</th><td class="taR" width="220">￥{{receiptDetail' value.amount}}
+									
 								</td></tr>
-								<tr><th>流水类型("支出"由公司汇出，"收入"提交人汇款至公司。)</th>
+								
+								<!-- <tr><th>流水类型("支出"由公司汇出，"收入"提交人汇款至公司。)</th>
 								<td class="taR" width="200">
 								
 								<select name="expensesType" >
@@ -254,7 +268,7 @@
 									<option value="EXPENDITURE">支出</option>
 								</select>
 								
-								</td></tr>
+								</td></tr>  -->
 										
 								<tr><th>银行</th>
 								<td class="taR" width="200">
@@ -284,7 +298,7 @@
 										支出
 										<!-- endif -->
 										</td></tr>
-										<tr><th>汇款金额</th><td class="taR" width="220">￥{{receiptDetail' value.amount}}
+										<tr><th>汇款金额</th><td class="taR" width="220">￥{{wbDetail.accountPriceShow}}
 										</td></tr>
 										<tr><th>提交人</th><td class="taR" width="220">
 										{{wbDetail.category}}-{{wbDetail.name}}</td></tr>
@@ -448,9 +462,18 @@
 						<table class="table table-bordered table-condensed table-hover">
 							<tbody>
 								<tr><th colspan="2" class="taC">确认汇款金额</th></tr>
+								
+								<tr>
+								<th>流水类型<br><span class="colGray">("支出"由公司汇出，"收入"提交人需汇款至公司。)</span></th>
+								<td class="taR" width="200">
+								<span class="colRed">支出</span></td>
+								</tr>
+								
 								<tr><th>汇款金额（用于生成汇款单）</th><td class="taR" width="220">￥
-									<input name='amount' placeholder="输入汇款金额" pattern="[0-9]" step="1" min="0" class="span2" type="number">
+									{{receiptDetail' value.amount}}
 								</td></tr>
+								
+								<!--  
 								<tr><th>流水类型("支出"由公司汇出，"收入"提交人汇款至公司。)</th>
 								<td class="taR" width="200">
 								
@@ -460,6 +483,7 @@
 								</select>
 								
 								</td></tr>
+										-->
 										
 								<tr><th>银行</th>
 								<td class="taR" width="200">
@@ -690,19 +714,25 @@
 						<table class="table table-bordered table-condensed table-hover">
 							<tbody>
 								<tr><th colspan="2" class="taC">确认汇款金额</th></tr>
+								
+								<tr><th>流水类型<br><span class="colGray">("支出"由公司汇出，"收入"提交人需汇款至公司。)</span></th>
+								<td class="taR" width="200">
+								 <span class="colRed">支出</span></td>
+								 </tr>
+								
 								<tr><th>汇款金额（用于生成汇款单）</th><td class="taR" width="220">￥
-									<input name='amount' placeholder="输入汇款金额" pattern="[0-9]" step="1" min="0" class="span2" type="number">
+			{{receiptDetail' value.amount}}
 								</td></tr>
+								
+								<!-- 
 								<tr><th>流水类型("支出"由公司汇出，"收入"提交人汇款至公司。)</th>
 								<td class="taR" width="200">
-								
 								<select name="expensesType" >
 									<option value="INCOME">收入</option>
 									<option value="EXPENDITURE">支出</option>
 								</select>
-								
 								</td></tr>
-										
+									 -->	
 								<tr><th>银行</th>
 								<td class="taR" width="200">
 								<select name="bank" id="bank">

protected/view/admin/invoiceAggregateCategoryDetail.html

@@ -36,7 +36,8 @@
 								<table class="table table-bordered table-condensed">
 									<tbody>
 									<tr><th class="taC">本月累计金额</th><td>￥{{isMC.invoicePrice}}</td><th class="taC">本月收款金额</th><td>￥{{isMC.receivablesPrice}}</td></tr>
-									<tr><th class="taC">本月入账金额</th><td>￥{{isMC.accountPrice}}</td><th class="taC">本月入账完成度</th><td>{{schedule}}%</td></tr>
+									<tr><th class="taC">本月入账金额</th><td colspan=3 >￥{{isMC.accountPrice}}</td>
+									<th class="taC" style="display:none">本月入账完成度</th><td style="display:none">{{schedule}}%</td></tr>
 									</tbody>
 								</table>
 							</div>
@@ -53,7 +54,9 @@
 									<th class="taC">本月开票</th>
 									<th class="taC">本月收款</th>
 									<th class="taC">本月入账</th>
-									<th class="taC">累计开票合计</th><th class="taC">累计收款合计</th><th class="taC">累计入账合计</th><th class="taC" width="90">入账完成度</th></tr>
+									<th class="taC">累计开票合计</th><th class="taC">累计收款合计</th><th class="taC">累计入账合计</th>
+									<th class="taC" width="90" style="display:none">入账完成度</th>
+									</tr>
 									<!-- loop slist -->
 									<tr>
 										<td>{{slist' value.username}}</td>
@@ -66,7 +69,7 @@
 										<td>￥{{slist' value.invoiceAllPrice}}</td>
 										<td>￥{{slist' value.receivablesAllPrice}}</td>
 										<td>￥{{slist' value.accountAllPrice}}</td>
-										<td>{{slist' value.schedule}}%</td>
+										<td style="display:none">{{slist' value.schedule}}%</td>
 									</tr>
 									<!-- endloop -->
 									

protected/view/admin/invoiceReceivablesAS.html

@@ -143,10 +143,7 @@
 						<a href="#refund" dataKey="{{list' value.iridKey}}" node-refund data-toggle="modal">退款</a><br/>
 						<!-- endif -->
 						
-						<!-- if {{list' value.bindStatus}}==0&&empty({{list' value.refundLog}}) -->
-						<a  href="#billdel" data-isKey="{{list' value.iridKey}}" node-irDelete data-toggle="modal">删除</a>
-						<br/>
-						<!-- endif -->
+						
 						
 						<!-- if {{list' value.receivablesStaff}}=='PUBLIC'&&{{list' value.iid}}==0&&{{list' value.receivablesPrice}}!=0 -->
 							<a href="#receive" data-isKey="{{list' value.iridKey}}" node-alter data-toggle="modal">变更</a>
@@ -169,7 +166,10 @@
 						<!-- if {{list' value.receivablesCategory}}=='PUBLIC' -->
 						<a  href="#claim" node-claim="receivables" data-key="{{receivablesInput' value.iridKeyK}}" data-toggle="modal">设置认领</a>
 						<!-- endif -->
-						
+						<!-- if {{list' value.bindStatus}}==0&&empty({{list' value.refundLog}})&&({{list' value.bindPrice}}==0) -->
+						<a  href="#billdel" data-isKey="{{list' value.iridKey}}" node-irDelete data-toggle="modal">删除</a>
+						<br/>
+						<!-- endif -->
 						</td>
 						</tr>
 					<!-- endloop -->

protected/view/admin/receiptburEdi.html

@@ -85,7 +85,7 @@
 	  						
 	  						<tr class="warning"><td class="taR"><b>本次报销金额</b></td>
 	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.sumCN}}</td></tr>
-							<tr <!-- if {{receiptDetail' value.relust}}>=0 --> class="success" <!-- else --> class="error" <!-- endif --> ><td class="taR"><b>差额</b></td>
+							<tr <!-- if {{receiptDetail' value.relust}}>=0 --> class="success" <!-- else --> class="error" <!-- endif --> ><td class="taR"><span class="colGray">报销 - 借款 = </span><b>差额</b></td>
 	  						<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.relust}}</b><br>{{receiptDetail' value.relustCN}}</td></tr>
 	  					
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
@@ -296,12 +296,45 @@
 	  				
 	  				<!-- endif -->
 	  				<br/>
-	  				<table class="table table-bordered table-condensed table-hover">
-							<tbody>
-								<tr><th colspan="2" class="taC">确认汇款金额</th></tr>
-								<tr><th>汇款金额（用于生成汇款单）</th><td class="taR" width="200">￥<input placeholder="输入汇款金额" pattern="[0-9]" id="amount" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number"></td></tr>
-							</tbody>
-						</table>
+	  				<!-- 
+	  	<table class="table table-bordered table-condensed table-hover">
+			<tbody>
+			<tr><th colspan="2" class="taC">确认汇款金额</th></tr>
+			<tr><th>汇款金额（用于生成汇款单）</th>
+			<td class="taR" width="200">￥<input placeholder="输入汇款金额" pattern="[0-9]" id="amount" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number"></td>
+			</tr>
+			</tbody>
+		</table>
+		 -->
+		
+		<table class="table table-bordered table-condensed table-hover">
+				<tbody>
+				<tr><th colspan="2" class="taC">费用结算</th></tr>
+				<tr><th>结算结果<br><span class="colGray">("支出"由公司汇出，"收入"提交人需汇款至公司。)</span></th>
+				<td class="taR" width="200">
+				<!-- if {{receiptList' value.Rtype}}==1 -->
+					<!-- if {{receiptDetail' value.relust}}>=0 -->
+					<span class="colRed">支出</span>
+					<!-- else -->
+					<span class="colGreen">收入</span>
+					<!-- endif -->
+				<!-- else -->
+				<span class="colRed">支出</span>
+				<!-- endif -->
+				
+				
+				</td>
+				</tr>
+				<tr><th>汇款金额</th><td class="taR" width="200">￥
+				<!-- if {{receiptList' value.Rtype}}==1 -->
+				{{receiptDetail' value.relust}}
+				<!-- else -->
+				{{receiptDetail' value.sum}}
+				<!-- endif -->
+				</td></tr>
+				</tbody>
+			</table>
+		
 	  				
 	  				</div>
 	  				

protected/view/admin/remitApproval.html

@@ -123,12 +123,23 @@
 	  					</table>
 	  					
 	  					<br/>
+	  					<!-- 
 	  				<table class="table table-bordered table-condensed table-hover">
 						<tbody>
 							<tr><th colspan="2" class="taC">确认汇款金额</th></tr>
 							<tr><th>汇款金额（用于生成汇款单）</th><td class="taR" width="200">￥<input placeholder="输入汇款金额" pattern="[0-9]" id="amount" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number"></td></tr>
 						</tbody>
 					</table>
+					 -->
+					<table class="table table-bordered table-condensed table-hover">
+				<tbody>
+				<tr><th colspan="2" class="taC">费用结算</th></tr>
+				<tr><th>结算结果<br><span class="colGray">("支出"由公司汇出，"收入"提交人需汇款至公司。)</span></th>
+				<td class="taR" width="200"><!-- <span class="colGreen">收入</span> --><span class="colRed">支出</span></td>
+				</tr>
+				<tr><th>汇款金额</th><td class="taR" width="200">￥{{receiptDetail' value.sum}}</td></tr>
+				</tbody>
+			</table>
 	  				</div>
 	  				
 	  				

protected/view/admin/saeaLoanEdiReceipt.html

@@ -53,7 +53,8 @@
 				
 				<div class="saeaList ">
 	  			<!-- loop receiptList -->
-	  			<div class="entry loan-list">
+	  			<div class="entry loan-list" >
+	  			<!-- 
 	  				<!-- if {{receiptList' value.status}}==1 -->
 	  				<div class="seal done"></div>
 	  				<!-- elseif {{receiptList' value.status}}==3 -->
@@ -61,7 +62,7 @@
 	  				<!-- elseif {{receiptList' value.status}}==4 -->
 	  				<div class="seal back"></div>	
 	  				<!-- endif -->
-	  				
+	  				 -->
 	  				
 	  				
 	  			

protected/view/menu.html

@@ -35,6 +35,9 @@
 </li>
 <!-- endif -->
 
+<li data-placement="right" data-toggle="ctooltip"  data-original-title="建筑激活">
+<a href="/build/activation" class="icon- <!-- if {{memu}}=="buildActivation" --> selected <!-- endif -->">D</a>
+</li>
 
 <!-- if isShowMenu('HR') -->
 <li data-placement="right" data-toggle="ctooltip" <!-- if isHRNew() --> class="news" <!-- endif --> data-original-title="人资管理">