设置行程单未改之前-相关操作

global/css/global.css

@@ -3993,4 +3993,67 @@ td div.dlLev3{
   background: #955251;
   padding: 0 3px;
   font-size: 10px;
+}
+.contactListBtn{
+  margin:150px 0 0 150px;
+}
+.activate{
+  display: inline-block;
+  color:#fff;
+  width:250px;
+  text-align: center;
+  padding:20px 0;
+  font-size: 16px;
+  background:#ff6501;
+  margin:0 20px 0 0;
+}
+.activate:hover,.activate:active{
+  background: #ff8130;
+  color:#fff;
+}
+
+
+
+.itineraryCon{
+  margin:20px 10px;
+}
+.itineraryTitle{
+  margin-top: 30px;
+  background: #084F8E;
+  color: #fff;
+  padding: 5px 10px;
+}
+.addressName{
+  font-size: 16px;
+}
+.itineraryCon ul li .pointLine{
+  margin:8px 0;
+  padding-left: 15px;
+  background:url(down_arrow.png) no-repeat 0 bottom;
+}
+.priceList{
+  margin-bottom: 10px;
+}
+.timeList{
+  padding: 5px 0 0 23px;
+}
+.itineraryCon ul li:last-child .pointLine{
+  background:url(down_arrow2.png) no-repeat 0 bottom;
+}
+.priceTitle,.routeTitle{
+  display: inline-block;
+  padding: 3px 8px;
+  background: #999;
+  color: #fff;
+  margin-right: 5px;
+}
+.price,.time,.route{
+  font-weight: bold;
+}
+.route{
+  margin-left: 5px;
+}
+.route p{
+  width: 570px;
+  margin-bottom: 5px;
 }

global/js/receipt.js

@@ -118,6 +118,10 @@ function showOpinion(receiptOrder){
 		});
 }
 
+
+
+
+
 $(function() {
 
 	
@@ -269,7 +273,7 @@ $(function() {
 		
 		var travelR=parseFloat($("#travelR").val());
 		var trainR=parseFloat($("#trainR").val());
-		var otherR=parseFloat($("#otherR").val());
+		var otherR=parseFloat($("#otherR").val().trim());
 		
 		if(typeof(travelR)=="number"){
 			travelR=0;
@@ -277,9 +281,9 @@ $(function() {
 		if(typeof(trainR)=="number"){
 			trainR=0;
 		}
-		if(typeof(otherR)=="number"){
-			otherR=0;
-		}
+//		if(typeof(otherR)=="number"){
+//			otherR=0;
+//		}
 		
 		var RS=parseFloat($i)+parseFloat(travelR)+parseFloat(trainR)+parseFloat(otherR);
 		

protected/class/receipt.func.php

@@ -390,7 +390,7 @@ function _getPaymentsCollectPayByYearHtml($statisticsPay = array()) {
 					11 => 0,
 					12 => 0 
 			);
-			$html .= '<tr><th rowspan="4" width="90">缴税</th>';
+			$html .= '<tr><th rowspan="8" width="90">缴税</th>';
 			$html .= '<th width="90">增值税</th>';
 			$sum = 0;
 			for($month = 1; $month <= 12; $month ++) {
@@ -435,6 +435,7 @@ function _getPaymentsCollectPayByYearHtml($statisticsPay = array()) {
 				$html .= '<td class="taR">￥' . $sum . '</td>';
 			$html .= '</tr>';
 			
+			//---------------
 			$html .= '<th width="90">企业所得税</th>';
 			$sum = 0;
 			for($month = 1; $month <= 12; $month ++) {
@@ -456,6 +457,104 @@ function _getPaymentsCollectPayByYearHtml($statisticsPay = array()) {
 			else
 				$html .= '<td class="taR">￥' . $sum . '</td>';
 			$html .= '</tr>';
+			//-----------
+			$html .= '<th width="90">工会费</th>';
+			$sum = 0;
+			for($month = 1; $month <= 12; $month ++) {
+				$falg = true;
+				foreach ( $statisticsPay as $key => $value ) {
+					if ($value ['expenditureMsg'] == '工会费' && $value ['month'] == $month && $value ['expenditureType'] == $i) {
+						$html .= '<td class="taR">￥' . $value ['payPrice'] . '</td>';
+						$sum += $value ['payPrice'];
+						$subtotal [$month] += $value ['payPrice'];
+						$falg = false;
+						break;
+					}
+				}
+				if ($falg)
+					$html .= '<td class="taR">-</td>';
+			}
+			if ($sum == 0){
+				$html .= '<td class="taR">-</td>';
+			}else{
+					$html .= '<td class="taR">￥' . $sum . '</td>';
+			}
+			$html .= '</tr>';
+			//-----------
+			$html .= '<th width="90">社保</th>';
+			$sum = 0;
+			for($month = 1; $month <= 12; $month ++) {
+				$falg = true;
+				foreach ( $statisticsPay as $key => $value ) {
+					if ($value ['expenditureMsg'] == '社保' && $value ['month'] == $month && $value ['expenditureType'] == $i) {
+						$html .= '<td class="taR">￥' . $value ['payPrice'] . '</td>';
+						$sum += $value ['payPrice'];
+						$subtotal [$month] += $value ['payPrice'];
+						$falg = false;
+						break;
+					}
+				}
+				if ($falg)
+					$html .= '<td class="taR">-</td>';
+			}
+			if ($sum == 0){
+				$html .= '<td class="taR">-</td>';
+			}else{
+				$html .= '<td class="taR">￥' . $sum . '</td>';
+			}
+			$html .= '</tr>';
+			
+			//-----------
+			$html .= '<th width="90">个税</th>';
+			$sum = 0;
+			for($month = 1; $month <= 12; $month ++) {
+				$falg = true;
+				foreach ( $statisticsPay as $key => $value ) {
+					if ($value ['expenditureMsg'] == '个税' && $value ['month'] == $month && $value ['expenditureType'] == $i) {
+						$html .= '<td class="taR">￥' . $value ['payPrice'] . '</td>';
+						$sum += $value ['payPrice'];
+						$subtotal [$month] += $value ['payPrice'];
+						$falg = false;
+						break;
+					}
+				}
+				if ($falg)
+					$html .= '<td class="taR">-</td>';
+			}
+			if ($sum == 0){
+				$html .= '<td class="taR">-</td>';
+			}else{
+				$html .= '<td class="taR">￥' . $sum . '</td>';
+			}
+			$html .= '</tr>';
+			
+			//-----------
+			$html .= '<th width="90">印花税</th>';
+			$sum = 0;
+			for($month = 1; $month <= 12; $month ++) {
+				$falg = true;
+				foreach ( $statisticsPay as $key => $value ) {
+					if ($value ['expenditureMsg'] == '印花税' && $value ['month'] == $month && $value ['expenditureType'] == $i) {
+						$html .= '<td class="taR">￥' . $value ['payPrice'] . '</td>';
+						$sum += $value ['payPrice'];
+						$subtotal [$month] += $value ['payPrice'];
+						$falg = false;
+						break;
+					}
+				}
+				if ($falg)
+					$html .= '<td class="taR">-</td>';
+			}
+			if ($sum == 0){
+				$html .= '<td class="taR">-</td>';
+			}else{
+				$html .= '<td class="taR">￥' . $sum . '</td>';
+			}
+			$html .= '</tr>';
+			
+			//-----------
+			
+			
 			
 			$html .= '<th width="90" class="colRed">小计</th>';
 			$sum = 0;
@@ -1365,7 +1464,7 @@ function _getPaymentsCollectPayByDayHtml($statisticsPay = array(), $day = 0) {
 			for($d = 1; $d <= $day; $d ++) {
 				$subtotal [$d] = 0;
 			}
-			$html .= '<tr><th rowspan="4" width="90">缴税</th>';
+			$html .= '<tr><th rowspan="8" width="90">缴税</th>';
 			$html .= '<th width="90">增值税</th>';
 			$sum = 0;
 			for($month = 1; $month <= $day; $month ++) {
@@ -1432,6 +1531,102 @@ function _getPaymentsCollectPayByDayHtml($statisticsPay = array(), $day = 0) {
 				$html .= '<td class="taR">￥' . $sum . '</td>';
 			$html .= '</tr>';
 			
+			//------------------------------
+			$html .= '<th width="90">工会费</th>';
+			$sum = 0;
+			for($month = 1; $month <= $day; $month ++) {
+				$falg = true;
+				foreach ( $statisticsPay as $key => $value ) {
+					if ($value ['expenditureMsg'] == '工会费' && $value ['day'] == $month && $value ['expenditureType'] == $i) {
+						$html .= '<td class="taR">￥' . $value ['payPrice'] . '</td>';
+						$sum += $value ['payPrice'];
+						$subtotal [$month] += $value ['payPrice'];
+						$falg = false;
+						break;
+					}
+				}
+				if ($falg)
+					$html .= '<td class="taR">-</td>';
+			}
+			if ($sum == 0){
+				$html .= '<td class="taR">-</td>';
+			}else{
+				$html .= '<td class="taR">￥' . $sum . '</td>';
+			}
+			$html .= '</tr>';
+			//----------------------------------------
+			$html .= '<th width="90">社保</th>';
+			$sum = 0;
+			for($month = 1; $month <= $day; $month ++) {
+				$falg = true;
+				foreach ( $statisticsPay as $key => $value ) {
+					if ($value ['expenditureMsg'] == '社保' && $value ['day'] == $month && $value ['expenditureType'] == $i) {
+						$html .= '<td class="taR">￥' . $value ['payPrice'] . '</td>';
+						$sum += $value ['payPrice'];
+						$subtotal [$month] += $value ['payPrice'];
+						$falg = false;
+						break;
+					}
+				}
+				if ($falg)
+					$html .= '<td class="taR">-</td>';
+			}
+			if ($sum == 0){
+				$html .= '<td class="taR">-</td>';
+			}else{
+				$html .= '<td class="taR">￥' . $sum . '</td>';
+			}
+			$html .= '</tr>';
+			//----------------------------------------
+			$html .= '<th width="90">个税</th>';
+			$sum = 0;
+			for($month = 1; $month <= $day; $month ++) {
+				$falg = true;
+				foreach ( $statisticsPay as $key => $value ) {
+					if ($value ['expenditureMsg'] == '个税' && $value ['day'] == $month && $value ['expenditureType'] == $i) {
+						$html .= '<td class="taR">￥' . $value ['payPrice'] . '</td>';
+						$sum += $value ['payPrice'];
+						$subtotal [$month] += $value ['payPrice'];
+						$falg = false;
+						break;
+					}
+				}
+				if ($falg)
+					$html .= '<td class="taR">-</td>';
+			}
+			if ($sum == 0){
+				$html .= '<td class="taR">-</td>';
+			}else{
+				$html .= '<td class="taR">￥' . $sum . '</td>';
+			}
+			$html .= '</tr>';
+			//----------------------------------------
+			$html .= '<th width="90">印花税</th>';
+			$sum = 0;
+			for($month = 1; $month <= $day; $month ++) {
+				$falg = true;
+				foreach ( $statisticsPay as $key => $value ) {
+					if ($value ['expenditureMsg'] == '印花税' && $value ['day'] == $month && $value ['expenditureType'] == $i) {
+						$html .= '<td class="taR">￥' . $value ['payPrice'] . '</td>';
+						$sum += $value ['payPrice'];
+						$subtotal [$month] += $value ['payPrice'];
+						$falg = false;
+						break;
+					}
+				}
+				if ($falg)
+					$html .= '<td class="taR">-</td>';
+			}
+			if ($sum == 0){
+				$html .= '<td class="taR">-</td>';
+			}else{
+				$html .= '<td class="taR">￥' . $sum . '</td>';
+			}
+			$html .= '</tr>';
+			//----------------------------------------
+			
+			
+			
 			$html .= '<th width="90" class="colRed">小计</th>';
 			$sum = 0;
 			for($month = 1; $month <= $day; $month ++) {

protected/config/acl.conf.php

@@ -479,6 +479,9 @@ $acl ['RECEIPTS'] ['allow'] = array (
 				'receiptFeeDiversion',
 				'feeAgency',
 				'feeTravel',
+				'addFeeTravel',
+				'feeInternalTrain',
+				'addFeeInternalTrain',
 				
 				'h5Upload',
 				'receiptTrainDo',

protected/config/js.edition.conf.php

@@ -1,9 +1,10 @@
 <?php
 
-define ( "index", WEB_SITE_GLOBAL.'js/index.js?1.08' );
+define ( "index", WEB_SITE_GLOBAL.'js/index.js?1.09' );
 define ( "receiptExtend", WEB_SITE_GLOBAL.'js/receiptExtend.js?1.03' );
 
 define ( "receipt", WEB_SITE_GLOBAL.'js/receipt.js?1.10' );
+define ( "itinerary", WEB_SITE_GLOBAL.'js/itinerary.js?1.11' );
 define ( "invoice", WEB_SITE_GLOBAL.'js/invoice.js?1.02' );
 define ( "payments", WEB_SITE_GLOBAL.'js/payments.js?1.03' );
 define ( "invoiceValidator", WEB_SITE_GLOBAL.'js/invoice.validator.js?1.02' );

protected/config/receipt/summary.conf.ini

@@ -1 +1 @@
-FUUXa
+lSP0C

protected/config/routes.conf.php

@@ -149,6 +149,12 @@ $route['*']['/approvalExpenses/:status'] = array('ReceiptController', 'approvalE
 $route['*']['/receiptFeeDiversion'] = array('ReceiptController', 'receiptFeeDiversion');
 $route['*']['/receipt/feeAgency'] = array('ReceiptController', 'feeAgency');
 $route['*']['/receipt/feeTravel'] = array('ReceiptController', 'feeTravel');
+$route['*']['/receipt/feeInternalTrain'] = array('ReceiptController', 'feeInternalTrain');
+$route['*']['/addReceipt'] = array('ReceiptController', 'addReceipt');
+$route['*']['/addFeeTravel'] = array('ReceiptController', 'addFeeTravel');
+$route['*']['/addFeeInternalTrain'] = array('ReceiptController', 'addFeeInternalTrain');
+
+
 //审批请求
 $route['*']['/expensesEdi/:rid'] = array('ReceiptController', 'expensesEdi');
 $route['*']['/expensesDefray'] = array('ReceiptController', 'expensesDefray');
@@ -162,6 +168,7 @@ $route['*']['/implement/:Rtype/:rid'] = array('ReceiptController', 'implement','
 
 $route['*']['/approvalExpenses/:status/:page'] = array('ReceiptController', 'approvalExpenses');
 $route['*']['/saeaLoanReceiptAdd/:rid'] = array('ReceiptController', 'saeaLoanReceiptAdd');
+
 $route['*']['/saeaLoanReceiptAddDo'] = array('ReceiptController', 'saeaLoanReceiptAddDo');
 $route['*']['/saeaLoanReceiptEdi/:rid'] = array('ReceiptController', 'saeaLoanReceiptEdi','extension'=>'.html');
 $route['*']['/implementDo'] = array('ReceiptController', 'implementDo');
@@ -184,9 +191,15 @@ $route['*']['/myReceipt/:item'] = array('ReceiptController', 'myReceipt');
 $route['*']['/myReceiptCache/:item/:year'] = array('ReceiptController', 'cacheMyReceipt');
 $route['*']['/myReceiptCache/:item/:year/:moth'] = array('ReceiptController', 'cacheMyReceipt');
 $route['*']['/saeaCreate'] = array('ReceiptController', 'saeaCreate');
-$route['*']['/addReceipt'] = array('ReceiptController', 'addReceipt');
+
+
+
+
+
 $route['*']['/referReceipt/:rid'] = array('ReceiptController', 'referReceipt');
 $route['*']['/referReceipt'] = array('ReceiptController', 'referReceipt');
+
+
 $route['*']['/editReceipt/:rid'] = array('ReceiptController', 'editReceipt','extension'=>'.html');
 $route['*']['/updateReceipt'] = array('ReceiptController', 'updateReceipt');
 $route['*']['/approvedReceipt/:rid'] = array('ReceiptController', 'approvedReceipt');

protected/controller/InvoiceController.php

@@ -3907,6 +3907,8 @@ class InvoiceController extends DooController {
 			
 			Doo::loadModel ( 'invoice' );
 			$invoice = new invoice ();
+			Doo::loadModel ( 'bill' );
+			$bill = new bill ();
 			Doo::loadClass ( 'XDeode' );
 			$XDeode = new XDeode ( 5 );
 			Doo::loadModel ( 'invoiceOperationLog' );
@@ -4057,6 +4059,14 @@ class InvoiceController extends DooController {
 			);
 			$invoiceStatistics->setInvoiceStatisticsByCondition ( $item );
 			
+			//发票入账记录
+			$bill->iid=$invoiceDetail['iid'];
+			$bill->trainId=$invoiceDetail['trainId'];
+			$bill->irid=$irid;
+			$bill->create_time=date ( "Y-m-d H:i:s" );
+			$bill->price=$receivablesPrice;
+			$bill->insert ();
+			
 			// 公司流水记录
 			Doo::loadModel ( 'wasteBook' );
 			$wasteBook = new wasteBook ();
@@ -4764,19 +4774,20 @@ class InvoiceController extends DooController {
 			// 修改 绑定状态改为 金额
 		$invoiceReceivables = new invoiceReceivables ();
 		
-		//有BUG-需修改
-		
 		$invoicePrice = $detail ['invoicePrice'] + $detailM ['bindPrice'];
+		$billPrice=0;
 		if ($detailM ['receivablesPrice'] > $invoicePrice) {
 			$item = array (
 					'bindPrice' => $invoicePrice 
 			);
-		} elseif ($detailM ['receivablesPrice'] <= $invoicePrice) {//发票金额大于收款金额，绑定金额为收款金额
+			$billPrice=$invoicePrice;
+		} elseif ($detailM ['receivablesPrice'] <= $invoicePrice) { //发票金额大于收款金额，绑定金额为收款金额
 			$item = array (
 					'bindPrice' => $detailM ['receivablesPrice'],
 					'bindStatus' => 1,
 					'bindDate' => date ( "Y-m-d H:i:s" ) 
 			);
+			$billPrice=$detailM ['receivablesPrice'];
 		} else {
 			die ( 'illegal request' );
 		}
@@ -4851,6 +4862,16 @@ class InvoiceController extends DooController {
 			// echo $sum;die;
 		$invoice->setInvoiceByCondition ( $item );
 		
+		//发票入账记录
+		Doo::loadModel ( 'bill' );
+		$bill = new bill ();
+		$bill->iid=$detail ['iid'];
+		$bill->trainId=$detail['trainId'];
+		$bill->irid=$detailM ['irid'];
+		$bill->create_time=date ( "Y-m-d H:i:s" );
+		$bill->price=$billPrice;
+		$bill->insert ();
+		
 		// 操作日志
 		$item = array (
 				'date' => date ( "Y-m-d H:i:s" ),
@@ -5824,7 +5845,7 @@ class InvoiceController extends DooController {
 				'priceClass' => 3,
 				'cid' => $invoiceDetails ['cid'],
 				'staff' => $invoiceDetails ['sid'],
-				'accountPrice' => - $irDetails ['receivablesPrice'] 
+				'accountPrice' => - $invoiceDetails ['invoicePrice'] 
 		);
 		$invoiceStatistics->setInvoiceStatisticsByCondition ( $item );
 		// 扣除收款统计金额
@@ -5835,7 +5856,7 @@ class InvoiceController extends DooController {
 				'cid' => $invoiceDetails ['cid'],
 				'staff' => $invoiceDetails ['sid'],
 				'irid' => $irDetails ['irid'],
-				'receivablesPrice' => - $irDetails ['receivablesPrice'] 
+				'receivablesPrice' => - $invoiceDetails ['invoicePrice']
 		);
 		$invoiceStatistics->setInvoiceStatisticsByCondition ( $item );
 		
@@ -5863,6 +5884,19 @@ class InvoiceController extends DooController {
 			);
 		$invoice->setInvoiceByCondition ( $item );
 		
+		
+		Doo::loadModel ( 'bill' );
+		$bill = new bill ();
+		$bill->iid=$invoiceDetails ['iid'];
+		$bill->trainId=$invoiceDetails['trainId'];
+		$bill->irid=$irDetails ['irid'];
+		$bill->create_time=date ( "Y-m-d H:i:s" );
+		$bill->price=-$invoiceDetails ['invoicePrice'];
+		$bill->remark='解绑-扣除入账';
+		$bill->insert ();
+		
+		
+		
 		$item = array (
 				'date' => date ( "Y-m-d H:i:s" ),
 				'operation' => '解绑 收款 ' . $irDetails ['receivablesSerial'],
@@ -5876,8 +5910,8 @@ class InvoiceController extends DooController {
 		$invoiceOperationLog->setInvoiceOperationLog ( $item );
 		
 		// 公司流水-解绑时删除流水
-		Doo::loadModel ( 'wasteBook' );
-		$wasteBook = new wasteBook ();
+// 		Doo::loadModel ( 'wasteBook' );
+// 		$wasteBook = new wasteBook ();
 		
 		// $wasteBook->delete ( array (
 		// 'where' => 'dataID=' . $irDetails ['irid'] . ' and accountType=7',
@@ -5975,7 +6009,7 @@ class InvoiceController extends DooController {
 		$get = "/" . $status . "?date=" . urlencode ( $date ) . "&MebSea=" . urlencode ( $MebSea );
 		
 		if (! empty ( $MebSea )) {
-			$con .= ' and ( invoiceTitle like "%' . $MebSea . '%"  or invoiceCompany like "%' . $MebSea . '%" or invoiceNo like "%' . $MebSea . '%" )';
+			$con .= ' and ( invoiceSerial like "%' . $MebSea . '%" or invoiceTitle like "%' . $MebSea . '%"  or invoiceCompany like "%' . $MebSea . '%" or invoiceNo like "%' . $MebSea . '%" )';
 		}
 		$pageinfo ['page'] = array (
 				'previous' => '' 

protected/controller/ReceiptExtendController.php

@@ -235,12 +235,17 @@ class ReceiptExtendController extends DooController {
 		if ($receiptDetail ['invoiceTrainId'] != 0) {
 			$invoiceTrainingDetail = $invoiceTraining->getInvoiceTrainingByItid ( $receiptDetail ['invoiceTrainId'] );
 		}
-		// print_r($invoiceTrainingDetail);
-		$invoiceArriveAmount = $RIAmount = 0;
+		//print_r($invoiceTrainingDetail);
+		$invoiceArriveAmount = $RIAmount=$billPrice = 0;
 		if (! empty ( $invoiceTrainingDetail )) {
 			$invoiceArriveAmount = $invoiceTrainingDetail ['invoiceArriveAmount'];
 			$RIAmount = $invoiceTrainingDetail ['RIAmount'];
+			if (!empty($invoiceTrainingDetail ['billPrice'])){
+				$billPrice=$invoiceTrainingDetail ['billPrice'];
+			}
+			
 		}
+		
 		$data ['invoiceTrainingDetail'] = $invoiceTrainingDetail;
 		// 支出项目
 		Doo::loadModel ( 'accountItem' );
@@ -265,6 +270,14 @@ class ReceiptExtendController extends DooController {
 		$data ['profit'] = sprintf ( "%.2f", $profit );
 		$data ['companyProfit'] = sprintf ( "%.2f", $companyProfit );
 		$data ['categoryProfit'] = sprintf ( "%.2f", $categoryProfit );
+		
+		$billProfit=$billPrice - $aiData ['total'];
+		$companyBillProfit = $billProfit * 0.6;
+		$categoryBillProfit = $billProfit * 0.4;
+		$data ['billProfit'] = sprintf ( "%.2f", $billProfit );
+		$data ['companyBillProfit'] = sprintf ( "%.2f", $companyBillProfit );
+		$data ['categoryBillProfit'] = sprintf ( "%.2f", $categoryBillProfit );
+		
 		// 发票利润
 		$data ['invoiceProfit'] = $invoiceTrainingDetail ['invoiceTotalAmount'] - $aiData ['total'];
 		
@@ -307,9 +320,21 @@ class ReceiptExtendController extends DooController {
 		$data ['aiCount'] = count ( $aiData ['dataList'] ) + 5;
 		$data ['aiList'] = $aiData ['dataList'];
 		
+		
 		// 占比计算
+		if($billPrice != 0){
+			$data ['totalBillProportion'] = sprintf ( "%.2f", $aiData ['total'] / $billPrice * 100 ); //入账金额占比新
+			$data ['profitBillProportion'] = sprintf ( "%.2f", $billProfit / $billPrice * 100 ); //入账金额占比新
+			$data ['companyBillProfitProportion'] = sprintf ( "%.2f", $companyBillProfit / $billPrice * 100 );
+			$data ['categoryBillProportion'] = sprintf ( "%.2f", $categoryBillProfit / $billPrice * 100 );
+			$data ['invoiceBillTotalAmountProportion'] = sprintf ( "%.2f", $data ['invoiceTrainingDetail'] ['invoiceCompanyAmount'] / $billPrice * 100 );
+		}else{
+			$data ['totalBillProportion'] =$data ['profitBillProportion'] =$data ['companyBillProfitProportion'] =$data ['categoryBillProportion'] =$data ['invoiceBillTotalAmountProportion'] =0;
+		}
 		if ($invoiceArriveAmount != 0) {
-			$data ['totalProportion'] = sprintf ( "%.2f", $aiData ['total'] / $invoiceArriveAmount * 100 );
+			
+			$data ['totalProportion'] = sprintf ( "%.2f", $aiData ['total'] / $invoiceArriveAmount * 100 );  //入账金额占比
+			
 			$data ['profitProportion'] = sprintf ( "%.2f", $profit / $invoiceArriveAmount * 100 ); // number_format ( $profit / $invoiceArriveAmount, 2, '.', '' ) * 100;
 			$data ['sumProportion'] = sprintf ( "%.2f", $sum / $invoiceArriveAmount * 100 ); // number_format ( $sum / $invoiceArriveAmount, 2, '.', '' ) * 100;
 			$data ['invoiceTotalAmountProportion'] = sprintf ( "%.2f", $data ['invoiceTrainingDetail'] ['invoiceCompanyAmount'] / $invoiceArriveAmount * 100 );
@@ -1935,6 +1960,19 @@ class ReceiptExtendController extends DooController {
 		);
 		$invoice->setInvoiceByCondition ( $item );
 		
+		
+		//发票入账记录
+		Doo::loadModel ( 'bill' );
+		$bill = new bill ();
+		$bill->iid=$detail ['iid'];
+		$bill->trainId=$detail['trainId'];
+		$bill->irid=$irid;
+		$bill->create_time=date ( "Y-m-d H:i:s" );
+		$bill->price=$detail ['invoicePrice'];
+		$bill->insert ();
+		
+		
+		
 		// 在是对冲收款 确保已收款不被删除
 		// Doo::loadModel ( 'RIExtend' );
 		// $RIExtend = new RIExtend ();

protected/model/bill.php

@@ -0,0 +1,41 @@
+<?php
+Doo::loadCore ( 'db/DooModel' );
+/**
+ * 发票审批相关信息及其操作业务逻辑
+ * @author CP.
+ * @version 1.0
+ * @namespace invoice
+ * @package invoiceModel
+ */
+class bill extends DooModel {
+	private $INVOICEKEY = "APPROVAL";
+	private $FUZZY = 'FUZZY';
+	private $EXACTLY = "EXACTLY";
+	
+	public $id;
+	public $iid;
+	public $trainId;
+	public $irid;
+	
+	public $price;
+	public $create_time;
+	public $remark;
+	
+
+	public $_table = 'CLD_bill';
+	public $_primarykey = 'id';
+	public $_fields = array (
+			'id',
+			'iid',
+			'irid',
+			'trainId',
+			
+			'price',
+			'create_time',
+			'remark',
+	);
+
+	
+}
+
+?>

protected/model/invoiceTraining.php

@@ -133,6 +133,7 @@ class invoiceTraining extends DooModel {
 	function getInvoiceTrainingByCid($cid = 0) {
 		$condition = array (
 				'where' => " cid=" . $cid,
+				'desc'=>'itid',
 				'asArray' => TRUE 
 		);
 		$list = $this->find ( $condition );
@@ -362,7 +363,7 @@ class invoiceTraining extends DooModel {
 				//培训班收款
 				$invoiceList = $invoice->sumOfinvoiceTrain ( $itidSql );
 				$invoiceRecelvablesList = $invoice->sumOfInvoiceRecelvablesTrain ( $itidSql );
-				//公司收款
+				//公司收款--新的入账--fix
 				$companyList = $invoice->sumOfInvoiceRecelvablesCompany ( $itidSql );
 				//获得办事处已收款
 				$RIList=$invoice->sumOfInvoiceByItid($itid);
@@ -370,6 +371,22 @@ class invoiceTraining extends DooModel {
 			}
 			 //print_r($invoiceRecelvablesList);
 			
+			//入账金额-培训班
+			Doo::loadModel ( 'bill' );
+			$bill = new bill ();
+			$billPrice=$bill->find(array (
+				'select'=>'sum(price) as price',
+				'where' => 'trainId='. $itid ,
+				'orderby' => 'trainId',
+				'asArray' => true 
+			));
+			$detail ['billPrice']=0;
+			if (!empty($billPrice)){
+				if (!empty($billPrice[0]['price'])){
+					$detail ['billPrice']=$billPrice[0]['price'];
+				}
+			}
+			
 			$countInvoice = $invoice->getInvoiceByTrainingCount ( $detail ['itid'] );
 			$detail ['invoiceTotal'] = $countInvoice;
 			
@@ -379,6 +396,7 @@ class invoiceTraining extends DooModel {
 					break;
 				}
 			}
+			
 			foreach ( $invoiceRecelvablesList as $i => $o ) {
 				if ($detail['itid'] == $o ['trainId']) {
 					$detail ['invoiceArriveAmount'] = $o ['receivablesPrice'];

protected/model/itinerary.php

@@ -0,0 +1,37 @@
+<?php
+Doo::loadCore ( 'db/DooModel' );
+/**
+ * 发票审批相关信息及其操作业务逻辑
+ * @author CP.
+ * @version 1.0
+ * @namespace invoice
+ * @package invoiceModel
+ */
+class itinerary extends DooModel {
+	
+	public $id;
+	public $rid;
+	public $sid;
+	public $itineraryDate;
+	public $itineraryCity;
+	
+	public $feeTraveItem;
+	public $itineraryIndex;
+	
+	public $_table = 'CLD_itinerary';
+	public $_primarykey = 'id';
+	public $_fields = array (
+			'id',
+			'rid',
+			'sid',
+			'itineraryDate',
+			'itineraryCity',
+			
+			'feeTraveItem',
+			'itineraryIndex',
+	);
+
+	
+}
+
+?>

protected/model/receipt.php

@@ -481,6 +481,7 @@ class receipt extends DooModel {
 		
 		$rinfo = $this->getOne ( array (
 				'where' => 'invoiceTrainId=' . $invoiceTrainId,
+				
 				'asArray' => true 
 		) );
 		

protected/model/staff.php

@@ -475,8 +475,8 @@ class staff extends DooModel {
 	 */
 	public function getStaffByApprovals(){
 		$list = $this->find ( array (
-				'asc' => 'InductionDate',
-				'where' => "username!= 'admin' and pendStatus=0 and InductionDate!=0",
+				'desc' => 'InductionDate',
+				'where' => "username!= 'admin' and (pendStatus=0 or pendStatus=4) and InductionDate!=0",
 				'limit' => 10,
 				'asArray' => TRUE
 		) );

protected/view/admin/invoiceAS.html

@@ -108,6 +108,7 @@
 							<!-- endloop -->
 							</td>
 							<td>
+							
 							<!-- if {{list' value.sumPrice}}==0 -->
 							<!-- elseif {{list' value.sumPrice}}=={{list' value.invoicePrice}} -->
 							<b >￥{{list' value.sumPrice}}</b>

protected/view/admin/invoiceAdd.html

@@ -29,10 +29,11 @@ $('input[amount]').keyup(function() {
 	
 	if(invoiceType==1&&invoiceQuantity != "" && invoiceQuantity != null && invoiceQuantity != 'undefined' && invoiceUnitPrice != "" && invoiceUnitPrice != null && invoiceUnitPrice != 'undefined'){ // "",null,undefined
 		var amount=invoiceQuantity*invoiceUnitPrice;
+		
 		if (!isNaN(amount) ){
 			$("#invoicePrice").val(amount);
 			if(amount>100001){
-				var msgHtml='<span class="msg-box n-right" for="invoicePrice"><span role="alert" class="msg-wrap n-error"><span class="n-icon"></span><span class="n-msg">此处必须小于10000</span></span></span>';
+				var msgHtml='<span class="msg-box n-right" for="invoicePrice"><span role="alert" class="msg-wrap n-error"><span class="n-icon"></span><span class="n-msg">此处必须小于100000</span></span></span>';
 				$("#msgMaxPrice").html(msgHtml);
 			}else{
 				$("#msgMaxPrice").html('');
@@ -59,7 +60,7 @@ $('#invoiceSpecial').click(function() {
 	if (!isNaN(amount) ){
 		$("#invoicePrice").val(amount);
 		if(amount>100001){
-			var msgHtml='<span class="msg-box n-right" for="invoicePrice"><span role="alert" class="msg-wrap n-error"><span class="n-icon"></span><span class="n-msg">此处必须小于10000</span></span></span>';
+			var msgHtml='<span class="msg-box n-right" for="invoicePrice"><span role="alert" class="msg-wrap n-error"><span class="n-icon"></span><span class="n-msg">此处必须小于100000</span></span></span>';
 			$("#msgMaxPrice").html(msgHtml);
 		}else{
 			$("#msgMaxPrice").html('');

protected/view/admin/invoiceStoreEdit.html

@@ -257,7 +257,7 @@ $('input[type=radio][name=invoiceForm]').change(function() {
 								</tr>
 								<tr>
 									<th class="taC" width="150">收件人手机</th>
-									<td><input class="contact" type="text"  name="electronicPhone" id="electronicPhone" value="{{invoiceDetail.electronicPhone}}" placeholder="手机号"
+									<td><input class="contact" type="text"  name="electronicPhone" id="electronicPhone" value="<!-- if empty({{invoiceDetail.electronicPhone}}) -->1<!-- else -->{{invoiceDetail.electronicPhone}}<!-- endif -->" placeholder="手机号"
 									data-rule="required(from, .contact); digits" data-msg-required="请至少填写一种联系方式">
 									</td>
 								</tr>

protected/view/contacts_client.html

@@ -382,6 +382,9 @@
 		  			<div  class="header" style="">
 		  				<h1 id="longleTitle"></h1>
 		  				<h2><span id="longleResponsible"></span> <span id="longleStatus">收回 / 专业版+河南养护</span></h2>
+		  				<h2 id="fileHtml">
+					
+					</h2>
 		  			</div>
 	  			
 	  			<div  class="lockRecord autoHeightR2" >

protected/view/expenses/payments.html

@@ -397,8 +397,9 @@
 								<option value='8'>广发存款</option>
 								<option value='9'>工行存款</option>
 
-
 								<option value="5">保证金</option>
+								
+								<option value="10">工资</option>
 							</select>
 							<!--缴税 二级-->
 							<div node-expenditureMsg3 style="display:none">
@@ -406,6 +407,10 @@
 							<label class="radio inline"><input name="expenditureMsg3" checked value="增值税" type="radio">增值税</label>
 							<label class="radio inline"><input name="expenditureMsg3"  value="税金附加" type="radio">税金附加</label>
 							<label class="radio inline"><input name="expenditureMsg3"  value="企业所得税" type="radio">企业所得税</label>
+							<label class="radio inline"><input name="expenditureMsg3" checked value="工会费" type="radio">工会费</label>
+							<label class="radio inline"><input name="expenditureMsg3"  value="社保" type="radio">社保</label>
+							<label class="radio inline"><input name="expenditureMsg3"  value="个税" type="radio">个税</label>
+							<label class="radio inline"><input name="expenditureMsg3"  value="印花税" type="radio">印花税</label>
 							</p>
 							</div>
 							

protected/view/expenses/paymentsCollect.html

@@ -71,28 +71,6 @@
 			</div>
 		</div>
 	</div>
-	<!--弹出-->
-<div class="modal hide fade" id="addCallout">
-    <div class="modal-header">
-    <h3>添加批注</h3>
-    </div>
-    <div class="modal-body">
-    <form class="">
-	    	<div class="control-group">
-				<div class="controls clearfix">
-					<label>
-	                	批注内容
-	              	</label>
-	              	<textarea rows="8" class="span6"></textarea>
-				</div>
-	    	</div>
-    </form>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">取消</a>
-	   	<a href="#" class="button">确定</a>
-	</div>
-</div>
-    <!--弹出内容-->
+
 <script type="text/javascript">autoFlashHeight();</script>
 </body>

protected/view/expenses/wasteBook.html

@@ -45,14 +45,18 @@
 										</tr>
 										
 										<tr>
+											<th class="taC">广发理财活期</th>
+											<td>￥{{waste.financial.current.CGBDeposit}}</td>
 											<th class="taC">工行理财活期</th>
 											<td>￥{{waste.financial.current.ICBCDeposit}}</td>
-											<th class="taC">个人理财固定</th>
-											<td>￥{{waste.financial.fixed.ICBCDeposit}}</td>
+											
 										</tr>
 										<tr>
-											<th class="taC">广发理财活期</th>
-											<td>￥{{waste.financial.current.CGBDeposit}}</td>
+                                            <th class="taC" colspan="4">活期结余金额：￥{{cashBalance}}</th>
+                                        </tr>
+										<tr>
+											<th class="taC">个人理财固定</th>
+											<td>￥{{waste.financial.fixed.ICBCDeposit}}</td>
 											<th class="taC">广发理财固定</th>
 											<td>￥{{waste.financial.fixed.CGBDeposit}}</td>
 										</tr>

protected/view/humanResource/hr.html

@@ -123,7 +123,7 @@
 										离职
 										<!-- endif -->
 									</td>
-									<td width="120">2018-06-07</td>
+									<td width="120">{{staffList' value.InductionDate}}</td>
 									</tr>
 									<!-- endloop -->
 									

protected/view/menu.html

@@ -20,7 +20,7 @@
 <!-- if isShowMenu('BUILD') -->
 
 <li data-placement="right" data-toggle="ctooltip"  data-original-title="云版管理">
-<a href="/cloud/curing/edition" class="icon- <!-- if {{memu}}=="buildActivation" --> selected <!-- endif -->">e</a>
+<a href="/cloud/curing/edition" target="_blank" class="icon- <!-- if {{memu}}=="buildActivation" --> selected <!-- endif -->">e</a>
 </li>
 
 <!-- endif -->
@@ -69,6 +69,6 @@
 </li> 
 
 <li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="/out" class="icon-">G</a></li>
-					
-					
-					
+<!--流量统计-->
+				<div style="position:absolute;left:-100px"><script type="text/javascript">document.write(unescape("%3Cspan id='cnzz_stat_icon_1278817584'%3E%3C/span%3E%3Cscript src='https://v1.cnzz.com/stat.php%3Fid%3D1278817584%26show%3Dpic1' type='text/javascript'%3E%3C/script%3E"));</script></div>
+				<!--流量统计-->

protected/view/receipt/feeAgency.html

@@ -3,7 +3,7 @@
  <link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css"> 
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
- <script src="<?= WEB_SITE_GLOBAL ?>js/receipt.js"></script>
+ <script src="<?= receipt ?>"></script>
  
 <body>
 	<div class="mainLayout">

protected/view/receipt/feeAgencyApproval.html

@@ -0,0 +1,337 @@
+<!-- include '../admin/header' -->
+  <script src="<?= WEB_SITE_GLOBAL ?>js/receipt.js"></script>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<!-- include '../admin/receipt_menu' -->
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+				<div class="borad-news">
+				<legend><div class="fR"></div>
+				费用审批
+				</legend>
+
+				<div class="demandCate">
+				<input type="hidden" name="status" value="{{receiptList.0.status}}"></input>
+					<ul class="cateList">
+						<li><a href="/approvalExpenses/pendApproval">返回</a></li>
+						<li><a id="examine" data="{{rid}}" href="javascript:void(0)">查看下一份费用审批</a></li>
+	  			</ul>
+	  		</div>
+	  		
+	  		
+	  		<div class="saeaList">
+	  		
+	  			<!-- loop receiptList -->
+	  			<div id="{{receiptList' value.Locate}}"  class="entry <!-- if {{receiptList' value.Rtype}}==1 -->  loan-list <!-- elseif  {{receiptList' value.Rtype}}==0 --> receipt-list <!-- endif -->">
+	  			
+	  			
+	  			
+	  			<div class="seTable reportTable">
+	  			
+	  				
+	  				<!-- if {{receiptList' value.Rtype}}==1 -->
+	  				<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+							<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次费用合计</b></td>
+							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+							</tr>
+							
+							<tr><th class="taC" colspan="2">费用说明</th>
+							</tr><tr><td colspan="2">{{explanation}}</td></tr>
+							
+							<tr><th colspan="2" class="taC">借款费用</th></tr>
+							
+							<!-- loop receiptList' value.loanItem.借款费用 -->
+	  							<tr><th>{{receiptList' value' value.name}}</th><td  width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+							
+							<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
+							<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
+							
+							
+							
+							
+							<tr class="warning" style="display:none"><td class="taR"><b>确认汇款金额</b></td>
+							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+							</tr>
+							
+							
+							<td class="taR"><b>本次借款</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+	  						</tr>
+	  						
+	  						<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"><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>
+	  					
+							
+							</tbody>
+						</table>
+				
+	  			<br/>
+	  				
+	  				<!-- endif -->
+	  				
+	  					
+	  					<table class="table table-bordered table-condensed table-hover">
+	  					<tbody>
+	  						
+	  						<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b></td></tr>
+	  						
+	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
+	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  						
+	  						<tr><th colspan="2" class="taC">日常相关费用</th></tr>
+	  						<!-- loop receiptList' value.accountItem.日常相关费用 -->
+	  							<tr><th>{{receiptList' value' value.name}}<div class="repMark fR"><i class="rmDone">●</i><i class="rmUdone">●</i><i class="rmClear">●</i></div></th><td  width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptList' value.accountItem.cSum.agencySum}}</td></tr>
+	  						
+
+							
+	  						
+	  						<tr><th colspan="2" class="taC">其他</th></tr>
+	  						<!-- loop receiptList' value.accountItem.其他 -->
+	  						<tr><th>{{receiptDetail' value' value.name}}<div class="repMark fR"><i class="rmDone">●</i><i class="rmUdone">●</i><i class="rmClear">●</i></div></th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.otherSum}}</td></tr>
+	  						
+	  						<!-- if {{status}}==2 -->
+	  						<tr><th colspan="2" class="taC">报销金额调整</th></tr>
+	  						<tr class="error"><td colspan="2" class="taR">
+	  						<form class="taR" style="margin:0" action="/revisePrice" method="post"  name="revisePrice_{{receiptList' value.rid}}">
+	  						<input type="text" name="description" placeholder="输入金额调整描述" class="span4"> ￥<span data-placement="top" data-toggle="ctooltip" data-original-title="扣款请在金额前加“-”">
+	  						<input type="number" name="price" placeholder="输入调整金额" pattern="[0-9]" step="0.01" class="span2"></span>
+	  						<input type="hidden" name="rid" value="{{receiptList' value.rid}}">
+	  						<input type="submit" value="添加" class="btn">
+	  						</form>
+	  						</td>
+	  						</tr>
+	  						<!-- elseif -->
+	  						<tr><th colspan="2" class="taC">报销金额调整</th></tr>
+	  						<!-- loop receiptList' value.reviseDetail -->
+	  						<tr><th><a href="/revocationAdjustment/{{receiptList' value' value.sidKey}}/{{receiptList' value' value.price}}/{{receiptList' value.ridKey}}/{{receiptList' value' value.reviseKey}}">撤销</a><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colOrange taR">￥{{receiptList' value.revisePrice}}</td></tr>
+	  						<!-- endif -->
+	  						
+	  						
+	  						
+	  						
+	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
+	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
+	  						
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
+							<tr><th>收款人户名</th>
+							<td>{{receiptDetail' value.remittanceName}}</td>
+							</tr>
+							<tr>
+							<th>收款银行</th>
+							<td>
+							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
+							广发银行
+							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
+							其他
+							<!-- endif -->
+							</td>
+							</tr>
+							<tr><th>收款开户银行名称</th><td>
+							{{receiptDetail' value.bankName}}
+							</td></tr>
+							<tr><th>收款账号</th><td>
+							{{receiptDetail' value.bankNumber}}
+							</td></tr>
+							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
+							<tr><th>联行号</th><td>
+							{{receiptDetail' value.coupletNumber}}
+							</td></tr>
+							<!-- endif -->
+	  						
+	  						
+	  						
+	  						
+	  						
+	  						<tr><th class="taC" colspan="2">附件</th>
+	  						</tr>
+	  						<tr><td colspan="2">
+	  						
+	  						{{enclosurHtml}}
+	  						
+	  						</td></tr>
+	  						
+	  						
+	  						
+
+						</tbody>
+	  					</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">
+				<!-- 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.relustABS}}
+				<!-- else -->
+				{{receiptDetail' value.sum}}
+				<!-- endif -->
+				</td></tr>
+				</tbody>
+			</table>
+		
+	  				
+	  				</div>
+	  				
+	  				<div class="seCensor <!-- if {{receiptList' value.Rtype}}==1 --> loan-censor <!-- else --> receipt-censor <!-- endif -->">
+	  					<form action="/updateApprovalReceipt" method="post" id="verifyOpinion_{{receiptList' value.rid}}" name="verifyOpinion_{{receiptList' value.rid}}">
+	  						<input type="hidden" id="status_{{receiptList' value.rid}}" name="status" value=""></input>
+	  						<input type="hidden" name="rid" value="{{receiptList' value.rid}}"></input>
+	  						<input type="hidden" name="Locate" value="{{receiptList' value.Locate}}"></input>
+	  						<input type="hidden" name="amount" value="{{receiptList' value.amount}}">
+		  					<div class="title">
+		  					{{receiptDetail' value.receiptOrder}}
+		  					</div>		  					
+		  					<div class="reportButton clearfix" style="display:" >
+		  					
+		  						<!-- if {{receiptDetail' value.button}}==4 -->
+		  						<a href="javascript:void(0)" onClick="updateApprovalReceipt(1,{{receiptList' value.rid}})" class="buttonDone buttonBlock">同意支付</a>
+		  						
+	  						
+		  						<!-- endif -->
+		  					</div>
+		  					<div class="censorList clearfix censorHeight">
+		  					<ul>
+		  					
+		  					<!-- if {{receiptList' value.Rtype}}==1 -->
+		  					<li class="post" >
+		  							<div class="avtra"><img src="{{receiptList' value.staffDetail.avatar}}_2.jpg" width="32"></div>
+		  							<div class="comment">
+		  								<p><span class="fR">{{loanReceiptDate}}</span>{{receiptList' value.staffDetail.username}}</p>
+		  								<p>提交审批</p>
+		  							</div>
+		  						</li>
+		  					
+		  					{{htmlLoan}}
+		  					
+		  					<!-- endif -->
+		  					
+		  					
+		  						<!-- if {{empty(receiptDetail' value.rlList)}} -->
+		  						<li class="post" >
+		  							<div class="avtra"><img src="{{receiptList' value.staffDetail.avatar}}_2.jpg" width="32"></div>
+		  							<div class="comment">
+		  								<p><span class="fR">
+		  								<!-- if {{receiptList' value.Rtype}}==1 -->
+		  								{{receiptList' value.date}}
+		  								
+		  								<!-- else -->
+		  								{{tijdate}}
+		  								<!-- endif -->
+		  								</span>{{receiptList' value.staffDetail.username}}</p>
+		  								<p>提交审批</p>
+		  							</div>
+		  						</li>
+		  						<!-- endif -->
+		  					
+		  						<!-- loop receiptDetail' value.rlList -->
+		  						<li  <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==4 --> class="back" <!-- elseif {{receiptDetail' value' value.status}}==2 --> class="post" <!-- endif --> >
+		  							<div class="avtra"><img src="{{receiptDetail' value' value.img}}_2.jpg" width="32"></div>
+		  							<div class="comment">
+		  								<p <!-- if {{receiptDetail' value' value.status}}!=2 --> class="colGray" <!-- endif --> ><span class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.username}} <!-- if {{receiptDetail' value' value.rolename}}!='' --> （{{receiptDetail' value' value.rolename}}） <!-- endif --></p>
+		  								<p>{{receiptDetail' value' value.opinion}}</p>
+		  							</div>
+		  						</li>
+		  						<!-- endloop -->
+		  						
+		  						<!-- loop receiptDetail' value.verifyList -->
+		  						
+		  						
+		  						<!-- if  {{receiptDetail' value' value.status}}!=1||{{empty(receiptDetail' value.rlList)}} -->
+			  						<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>
+			  							<!-- if {{receiptDetail' value' value.status}}==4 -->
+			  							<div class="comment">
+			  								{{receiptDetail' value' value.1}}<!-- if isset({{receiptDetail' value' value.rolename}}) --> （{{receiptDetail' value' value.rolename}}） <!-- endif -->
+			  								<p><textarea name="opinion" id="opinion_{{receiptList' value.rid}}" placeholder="填写审批意见（可选）"></textarea></p>
+			  							</div>
+			  							<!-- else -->
+			  							<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>
+			  								<p>{{receiptDetail' value' value.opinion}}</p>
+			  							</div>
+			  							<!-- endif -->
+			  						</li>
+		  						<!-- endif -->
+		  						
+		  						<!-- endloop -->
+		  						
+		  					</ul>
+		  					</div>
+					<div class="reportButton clearfix" style="display:" >
+		  					
+		  						<!-- if {{receiptDetail' value.button}}==4 -->
+		  						
+		  						<a href="javascript:void(0)" p-d="{{receiptList' value.rid}}" node-ReceiptBack="true" class="buttonBack <!-- if {{receiptList' value.Rtype}}==1 --> buttonBlock  <!-- endif -->" data-placement="top" data-toggle="ctooltip" data-original-title="上报人修改后由你继续审批">撤回</a>
+	  							<!-- if {{receiptList' value.Rtype}}!=1 -->
+	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(3,{{receiptList' value.rid}})" class="buttonUndone" data-placement="top" data-toggle="ctooltip" data-original-title="终止报销单">终止</a>
+	  							<!-- endif -->
+	  						
+		  						<!-- endif -->
+		  					</div>
+	  					</form>
+	  				</div>
+	  				
+	  			</div>
+	  		<!-- endloop -->
+	  		</div>
+	  		
+	  		</div>
+	  		
+			</div>
+		</div>
+	</div>
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/view/receipt/feeAgencyEdi.html

@@ -0,0 +1,447 @@
+<!-- include '../admin/header' -->
+
+ <link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css"> 
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
+ <script src="<?= receipt ?>"></script>
+ 
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="/" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<!-- include '../admin/receipt_menu' -->
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+		  		<div class="borad-news">
+					<legend><div class="fR"></div>申请报销单</legend>
+			  		<div class="saeaList">
+			  			<div class="entry receipt-list">
+			  				<div class="seTable">
+			  				<input type="hidden" id="agencyR" value="{{cSum.agencySum}}" />
+	  				
+	  						<input type="hidden" id="otherR" value="{{cSum.otherSum}}" />
+	  				
+			  				<form action="/updateReceipt" name="recepitAdd" method="post">
+			  				
+			  					<input type="hidden" name="rid" value="{{rid}}"/>
+			  				<input type="hidden" name="receiptClass" value="1"/>
+			  				
+			  					<table class="table table-bordered table-condensed table-hover">
+			  					<tbody>
+			  						<tr><th colspan="2" class="taC">办事处相关费用</th></tr>
+			  						
+			  						<!-- loop acItem -->
+		  						<!-- if {{acItem' value.category}} =="日常相关费用" -->
+		  						<tr <!-- if {{acItem' value.name}}=='市内出租费' --> style="display:none" <!-- endif --> >
+		  						<th>{{acItem' value.name}}</th>
+		  						<td  width="200" class="taR">
+		  						￥<input type="number" <!-- if !empty({{acItem' value.price}}) --> value="{{acItem' value.price}}" <!-- else --> value="0" <!-- endif --> id="agency_{{acItem' value.aid}}" name="agency[]"  placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2">
+		  						</td>
+		  						</tr>
+		  						<!-- endif -->
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR" id="agencyResult">￥{{cSum.agencySum}}</td></tr>
+	  						
+			  						
+			  						<tr><th colspan="2" class="taC">其他</th></tr>
+			  						
+			  					<!-- loop acItem -->
+		  						<!-- if {{acItem' value.category}} =="其他" -->
+	  						<tr><th>{{acItem' value.name}}</th>
+	  						<td  width="200" class="taR">￥<input type="number" id="other_{{acItem' value.aid}}" name="other[]" <!-- if !empty({{acItem' value.price}}) --> value="{{acItem' value.price}}" <!-- else --> value="0" <!-- endif --> placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2"></td></tr>
+	  							<!-- endif -->
+	  						<!-- endloop -->
+	  						
+	  						<tr><th class="taR">合计</th><td class="colGreen taR" id="otherResult">￥{{cSum.otherSum}}</td></tr>
+	  						
+			  						
+			  					<tbody publicRelations--termination style="display:none">
+			  						<tr><th colspan="2" class="taC">公关费绑定发票</th></tr>
+			  						<tr><th class="colRed">本次报销有公关费支出，确认是否涉需要绑定发票</th>
+			  						<td class="taR">
+				  						<select bindInvoice class="span2" style="display:none">
+				  						<option value="1">绑定开票</option>
+				  						<option value="0">不需要</option>
+				  						</select>
+			  						</td>
+			  						</tr>
+			  						
+			  						
+			  						<tr>
+			  							<td colspan="2">
+			  								<div invoice>
+					  							<table class="table table-bordered table-condensed table-hover">
+					  								<tbody>
+					  								<tr><th></th><td class="taR"><a class="button" href="#add-invoice" data-toggle="modal">添加发票</a></select></td></tr>
+				  						<tr><th>发票</a></th><td class="taR">公关费（￥<span publicRelationsPrice >0.00</span>）</td></tr>
+				  						<tr>
+				  						<th binded_invoce >
+				  						
+				  						
+				  						
+				  						</th>
+				  						<td class="taR">
+				  						￥<input type="number" rebate value="0" pattern="[0-9]" step="1" min="0" class="span2">
+				  						</td>
+				  						</tr>
+					  							</tbody></table>
+					  						</div>
+			  							</td>
+			  						</tr>
+			  						
+			  						
+			  						
+				  						<!-- <tbody  >
+				  						<tr><th></th><td class="taR"><a class="button" href="#add-invoice" data-toggle="modal">添加发票</a></select></td></tr>
+				  						<tr><th>发票</a></th><td class="taR">公关费（￥<span publicRelationsPrice >0.00</span>）</td></tr>
+				  						<tr>
+				  						<th binded_invoce >
+				  						
+				  						
+				  						
+				  						</th>
+				  						<td class="taR">
+				  						￥<input type="number" rebate value="0" pattern="[0-9]" step="1" min="0" class="span2">
+				  						</td>
+				  						</tr>
+				  						</tbody> -->
+				  						
+			  					</tbody>
+			  						
+			  						<tr class="warning"><td class="taR"><b>本次报销费用合计</b></td><td class="colGreed taR"><b style="font-size:24px" id="RS">￥{{sum}}</b></td></tr>
+									
+									
+									
+									<!-- if {{receiptDetail.status}}!=4 -->
+	  						<tr>
+								<th>选择审批组</th>
+								<td class="taR">
+								<select name="verify">
+								<!-- loop veList -->
+								<option <!-- if {{receiptDetail.verify}}=={{veList' value.vid}} --> selected <!-- endif --> value="{{veList' value.vid}}" >{{veList' value.description}}（
+								{{veList' value.staff}}）</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>
+	  						<!-- endif -->
+							
+							
+							<tr><th colspan="2" class="taC">产生费用所在办事处</th></tr>
+							<tr>
+								<th>选择办事处</th>
+								<td class="taR">
+								<select name="cid" class="span2">
+								<!-- loop category -->
+								<option <!-- if {{receiptDetail.cid}}=={{category' value.cid}} --> selected <!-- endif --> value="{{category' value.cid}}" >{{category' value.title}}</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>	
+	  						
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
+							<tr><th>收款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入收款人户名" ></td>
+							</tr>
+							<tr>
+							<th>收款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">广发银行</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							<tr><th>收款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入收款开户银行名称" >
+							</td></tr>
+							<tr><th>收款账号</th><td>
+							<input type="text" placeholder="请输入收款账号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
+							</td></tr>
+							<tr node-cn style="display:none" ><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是广发银行，务必填上银行联行号）</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
+							</td></tr>
+	  						
+	  						<tr><th colspan="2" class="taC">报销说明</th></tr>
+	  						<tr><th colspan="2">
+	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="市内交通费、邮寄费、公关费、办公费等费用说明，请详细填写在这。">{{receiptDetail.explanation}}</textarea>
+	  						</th></tr>
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">附件</th></tr>
+	  						<tr><td colspan="2">
+	  							
+	  							<!--已上传文件-->
+	  							<table class="table" >
+	  								<thead>
+	  								<tr>
+	  								<th>
+	  									<input enclosurFile type="file" 
+	  								accept="image/png,image/gif,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document
+	  								,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel" name="file" />
+	  								
+										<input type="hidden" id="enclosurName" name="enclosurName" value="">
+	  								
+	  								</th>
+	  								<th colspan="2">
+	  								<span class="fieldset flash" id="fsUploadProgress"></span>
+									<span id="divStatus">0 个文件已上传</span>
+									
+										
+	  								</th></tr>
+	  								<tr><th>文件名</th><th>大小</th><th>操作</th></tr></thead>
+	  								<tbody id="KT">
+	  								
+	  								<!-- loop enclosurList -->
+	  								<tr id="{{enclosurList' value.eidKey}}">
+	  								<td><a href="/upload/swfupload/{{enclosurList' value.name}}" target="_blank">{{enclosurList' value.name}}</a></td>
+	  								<td></td>
+	  								<td><a href="javascript:void(0)" onclick="delEnclosurByKey('{{enclosurList' value.eidKey}}')">删除</a></td>
+	  								</tr>
+	  								<!-- endloop -->
+	  								</tbody>
+	  							</table>		
+	  						</td></tr>
+	  						
+	  						
+	  						</tbody>
+			  					</table>
+			  					<table class="table">
+			  						<tr><td><input type="submit" value="生成报销单 >>" class="button" /></td></tr>
+			  					</table>
+			  					</form>
+			  				</div>
+			  				<div class="seCensor receipt-censor">
+			  					<div class="title">
+			  					报销单填写说明
+			  					</div>
+				  				<div class="detail">
+				  					<p>1 办事处水电费标准100元，标准内实报；</p>
+				  					<p>2 <b>产生费用所在办事处</b> 默认使用您所在的第一个办事处；</p>
+				  					<p>3 邮寄费、公关费、办公费等详细说明请填写到 <b>报销说明</b>。</p>
+			  					</div>
+			  				</div>
+			  			</div>
+					</div>
+				</div>
+		</div>
+	</div>
+	
+	
+	<!--弹出 添加发票-->
+<div class="modal hide fade" id="add-invoice">
+
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
+		    <div class="modal-header">
+		    <h3>添加发票</h3>
+		    </div>
+		    <div class="modal-body">
+		     	<blockquote>
+					<p>暂时没有查询到“珠海XXXX公司”发票</p>
+					<p></p><div class="input-append">
+							<input class="datepicker-here span4" wd placeholder="你可以按关键词模糊搜索" data-range="true" data-multiple-dates-separator=" - " data-language="zh" type="text">
+							<button class="btn btn-small" search_invoice type="button">查询</button>
+					</div><p></p>
+				</blockquote>
+				<table class="table table-bordered table-condensed">
+					<thead><tr><th>开票单位（抬头）</th><th>开票金额</th><th>结算方式</th><th>提交开票</th><th>出票</th><th>开票流水号</th><th width="80">操作</th></tr></thead>
+					<tbody invoiceList>
+						</tbody>
+				</table>
+		    </div>
+			<div class="modal-footer">
+			    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">取消</a>
+			</div>
+		</div>
+	</div>
+
+</div>
+
+
+	
+    <!--弹出内容-->
+<script type="text/javascript">autoFlashHeight();</script>
+<script >
+ $(function() {
+ 
+	 $("input[id^='inttrain_']").change(function() {
+			
+			$i=0;
+			$("input[id^='inttrain_']").each(function(i){
+				$i+=parseFloat(this.value);
+				
+			 });
+			$("#inttrainResult").html("￥"+$i.toFixed(2));
+			$("#inttrainR").val($i.toFixed(2));
+			
+			var agencyR=$("#agencyR").val();
+			var otherR=parseFloat($("#otherR").val());
+			
+			var RS=parseFloat($i)+parseFloat(agencyR)+otherR;
+		
+			$("#RS").html("￥"+RS.toFixed(2));
+		});
+	 
+	 $("select[bindInvoice]").change(function() {
+			
+		 var option=$(this).val();
+		 if(option!=0){ 
+				$("div[invoice]").show();
+				
+			}else{
+				$("div[invoice]").hide();
+			}
+		});
+	 
+	 $("input[publicRelationsInput]").keyup(function() {
+			var price=$(this).val();
+			if(price!=0){
+				$("tbody[publicRelations]").show();
+				$("span[publicRelationsPrice]").html(price);
+				
+				
+			}else{
+				$("tbody[publicRelations]").hide();
+			}
+		});
+	 
+	 $('tbody[invoiceList]').delegate( "a[node-invoice='INFO']",'click', function(){
+		 	var postData = $(this).attr("data-isKey");
+			var type =$(this).attr("data-type");
+			invoice(postData,type);
+			
+	 });
+	 
+	 $('div[invoice]').delegate( "a[node-invoice='INFO']",'click', function(){
+		 	var postData = $(this).attr("data-isKey");
+			var type =$(this).attr("data-type");
+			invoice(postData,type);
+			
+	 });
+	 
+	 
+	 $("button[search_invoice]").click(function() {
+		 var wd=$("input[wd]").val();
+		 
+		 var params = {
+			        where: {
+			        	'invoiceTitle_like':wd,
+			        	'untreadStatus_or':[0,3],
+			        	'status_or':[1,2],
+			        }
+			    };
+		
+		params = JSON.stringify(params);
+		 
+		 $.ajax({
+				url:'/api/invoice?filter='+params,
+				type: "get",
+				cache: false,
+				dataType: "json",
+				success: function(data){
+					buildInvoice(data);
+					
+				},
+				error:function(err){
+				}
+				});
+		 
+		});
+	 
+ })
+ function buildInvoice(data){
+	 var html='';
+	 for(var i=0;i<data.length;i++){
+		 html+='<tr><td>'+data[i]['invoiceTitle']+'</td><td>￥'+data[i]['invoicePrice'];
+		if(data[i]['invoiceType']==1){
+			 html+='专';
+		}
+		html+='</td>';
+		if(data[i]['settlementType']==1){
+			html+='<td>培训班（<a href="/invoiceTrainingDetail/'+data[i]['trainId']+'.html" target="_blank">查看</a>）</td>';
+		}else{
+			html+='<td>软件销售</td>';
+		}
+		
+		html+='<td>'+data[i]['categoryName']+''+data[i]['userName']+'<br> '+data[i]['date']+'</td><td>'+data[i]['printer']+'<br>'+data[i]['printTime']+'</td>';
+		html+='<td><a href="#invdetail" node-invoice="INFO" data-iskey="'+data[i]['iid']+'" data-toggle="modal">'+data[i]['invoiceSerial']+'</a></td>';
+		html+='<td><a class="button btn-block" data-dismiss="modal" aria-hidden="true" onclick="bind_invoice(\''+data[i]['iid']+'\',\''+data[i]['invoiceSerial']+'\')" href="#">添加</a></td></tr>';
+	}
+	$('tbody[invoiceList]').html(html);
+ 
+ }
+ function bind_invoice(iid,invoiceSerial){
+	 var html='<a href="#invdetail" node-invoice="INFO" data-iskey="'+iid+'" data-toggle="modal">'+invoiceSerial+'</a>';
+	 html+='<a href="#invdetail" onclick="remove_invoice()"  class="fR">移除</a>';
+	 $('#iid').val(iid);
+	 $('th[binded_invoce]').html(html);
+ }
+ 
+ function remove_invoice(){
+	 $('#iid').val('');
+	 $('th[binded_invoce]').html('');
+ }
+ 
+ function invoice(postData,type){
+	/*  var postData = $(this).attr("data-isKey");
+		var type =$(this).attr("data-type"); */
+		
+		var po='INVOICE';
+		if(type=='receivables')
+			po='RECEIVABLES';
+		
+		$("div[loading-msg='true']").html("<img src='/global/img/loadIco.gif' />");
+		var url = "/ajaxGetInvoiceInfoByType";
+		$.ajax({
+			url : url,
+			type : "post",
+			cache : false,
+			dataType : "json",
+			data : {
+				serial : postData,
+				type:po
+			},
+			global : true,
+			success : function(data) {
+				if (data.status == 1) {
+					$("div[loading-msg='true']").html("");
+					if(type=='receivables')
+						$("#nr").html(data.html);
+					else
+						$("#nc").html(data.html);
+				} else
+					$("div[loading-msg='true']").html("illegal request");
+			},
+			error : function(err) {
+				$("div[loading-msg='true']").html("");
+				$("#nr").html('');
+				$("#nc").html('');
+			}
+		});
+ }
+ 
+ </script>
+ 
+ <!--弹出（发票详情）-->
+     <div loading-msg='true' style="position:absolute;  left:50%;  top:50%;  "></div>
+	<div class="modal  fade" id="invdetail">
+		
+		<div id="nc"></div>
+	</div>
+
+	<div class="modal  fade" id="billing">
+		<div id="nr"></div>
+	</div>
+ 
+</body>

protected/view/receipt/feeInternalTrain.html

@@ -0,0 +1,384 @@
+<!-- include '../admin/header' -->
+
+ <link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css"> 
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
+ <script src="<?= WEB_SITE_GLOBAL ?>js/receipt.js"></script>
+ 
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="/" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<!-- include '../admin/receipt_menu' -->
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+		  		<div class="borad-news">
+					<legend><div class="fR"></div>申请报销单</legend>
+			  		<div class="saeaList">
+			  			<div class="entry receipt-list">
+			  				<div class="seTable">
+			  				<input type="hidden" id="agencyR" value="0" />
+	  				
+	  						<input type="hidden" id="otherR" value="0" />
+			  				<form action="/addFeeInternalTrain" name="recepitAdd" method="post">
+			  				
+			  					<input type="hidden" name="iid" id="iid" value="" />
+			  				
+			  				
+			  					<table class="table table-bordered table-condensed table-hover">
+			  					<tbody>
+			  					
+			  						<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+	  						<!-- loop acItem -->
+		  						<!-- if {{acItem' value.category}} =="内部培训费用" -->
+	  						<tr>
+	  						<th>{{acItem' value.name}}</th>
+	  						<td  width="200" class="taR">￥<input type="number" id="inttrain_{{acItem' value.aid}}" name="inttrain[]" value="0" placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2"></td>
+	  						</tr>
+	  							<!-- endif -->
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR" id="inttrainResult">￥0.00</td></tr>
+			  						
+			  						
+			  					<tbody publicRelations--termination style="display:none">
+			  						<tr><th colspan="2" class="taC">公关费绑定发票</th></tr>
+			  						<tr><th class="colRed">本次报销有公关费支出，确认是否涉需要绑定发票</th>
+			  						<td class="taR">
+				  						<select bindInvoice class="span2" style="display:none">
+				  						<option value="1">绑定开票</option>
+				  						<option value="0">不需要</option>
+				  						</select>
+			  						</td>
+			  						</tr>
+			  						
+			  						
+			  						<tr>
+			  							<td colspan="2">
+			  								<div invoice>
+					  							<table class="table table-bordered table-condensed table-hover">
+					  								<tbody>
+					  								<tr><th></th><td class="taR"><a class="button" href="#add-invoice" data-toggle="modal">添加发票</a></select></td></tr>
+				  						<tr><th>发票</a></th><td class="taR">公关费（￥<span publicRelationsPrice >0.00</span>）</td></tr>
+				  						<tr>
+				  						<th binded_invoce >
+				  						
+				  						
+				  						
+				  						</th>
+				  						<td class="taR">
+				  						￥<input type="number" rebate value="0" pattern="[0-9]" step="1" min="0" class="span2">
+				  						</td>
+				  						</tr>
+					  							</tbody></table>
+					  						</div>
+			  							</td>
+			  						</tr>
+			  						
+			  					</tbody>
+			  						
+			  						<tr class="warning"><td class="taR"><b>本次报销费用合计</b></td><td class="colGreed taR"><b style="font-size:24px" id="RS">￥0.00</b></td></tr>
+									
+									
+									
+									<tr>
+								<th>选择审批组</th>
+								<td class="taR">
+								<select name="verify">
+								<option  value="" >请选择审批组</option>
+								<!-- loop veList -->
+								<option value="{{veList' value.vid}}" >{{veList' value.description}}（
+								{{veList' value.staff}}
+								
+								）</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>
+							<tr><th colspan="2" class="taC">产生费用所在办事处</th></tr>
+							<tr>
+								<th>选择办事处</th>
+								<td class="taR">
+								<select name="cid" class="span2">
+								<!-- loop category -->
+								<option <!-- if {{category' value.cid}} == {{staff.0.cid}}  --> selected <!-- endif --> value="{{category' value.cid}}" >{{category' value.title}}</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>
+	  						
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
+							<tr><th>收款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{staff.0.remittanceName}}" placeholder="请输入收款人户名" ></td>
+							</tr>
+							
+							<tr>
+							<th>收款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">广发银行</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							
+							<tr><th>收款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{staff.0.bankName}}" placeholder="请输入收款开户银行名称" >
+							</td></tr>
+							<tr><th>收款账号</th><td>
+							<input type="text" placeholder="请输入收款账号" id="bankNumber" name="bankNumber" value="{{staff.0.bankNumber}}">
+							</td></tr>
+							<tr node-cn style="display:none" ><th class="tipFather">联行号&nbsp;<span class="tipGray">?</span><div class="tipContent tipConactive"><p>1.如不是公司广发，务必填上银行联行号</p><p>2.如不清楚银行联行号请咨询报销查款专用 QQ：2870766094</p></div></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{staff.0.coupletNumber}}">
+							</td></tr>
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">报销说明</th></tr>
+	  						<tr><th colspan="2">
+	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="市内交通费、邮寄费、公关费、办公费等费用说明，请详细填写在这。"></textarea>
+	  						</th></tr>
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">附件</th></tr>
+	  						<tr><td colspan="2">
+	  							
+	  							<!--已上传文件-->
+	  							<table class="table" >
+	  								<thead>
+	  								<tr>
+	  								<th>
+	  								
+	  								<input enclosurFile type="file" 
+	  								accept="image/png,image/gif,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document
+	  								,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel" name="file" />
+	  								
+									<input type="hidden" id="enclosurName" name="enclosurName" value="">
+	  								
+	  								</th>
+	  								<th colspan="2">
+	  								<span class="fieldset flash" id="fsUploadProgress"></span>
+									<span id="divStatus">0 个文件已上传</span>
+									
+										
+	  								</th></tr>
+	  								<tr><th>文件名</th><th>大小</th><th>操作</th></tr></thead>
+	  								<tbody id="KT">
+	  							<!--已上传文件-->
+	  								
+	  				</tbody>
+	  							</table>		
+	  						</td></tr>
+	  						
+	  						
+	  						</tbody>
+			  					</table>
+			  					<table class="table">
+			  						<tr><td><input type="submit" value="生成报销单 >>" class="button" /></td></tr>
+			  					</table>
+			  					</form>
+			  				</div>
+			  				<div class="seCensor receipt-censor">
+			  					<div class="title">
+			  					报销单填写说明
+			  					</div>
+				  				<div class="detail">
+				  					<p>1 办事处水电费标准100元，标准内实报；</p>
+				  					<p>2 <b>产生费用所在办事处</b> 默认使用您所在的第一个办事处；</p>
+				  					<p>3 邮寄费、公关费、办公费等详细说明请填写到 <b>报销说明</b>。</p>
+			  					</div>
+			  				</div>
+			  			</div>
+					</div>
+				</div>
+		</div>
+	</div>
+	
+	
+
+
+
+	
+    <!--弹出内容-->
+<script type="text/javascript">autoFlashHeight();</script>
+<script >
+ $(function() {
+ 
+	 $("input[id^='inttrain_']").change(function() {
+			
+			$i=0;
+			$("input[id^='inttrain_']").each(function(i){
+				$i+=parseFloat(this.value);
+				
+			 });
+			$("#inttrainResult").html("￥"+$i.toFixed(2));
+			$("#inttrainR").val($i.toFixed(2));
+			
+			var agencyR=$("#agencyR").val();
+			var otherR=parseFloat($("#otherR").val());
+			
+			var RS=parseFloat($i)+parseFloat(agencyR)+otherR;
+		
+			$("#RS").html("￥"+RS.toFixed(2));
+		});
+	 
+	 $("select[bindInvoice]").change(function() {
+			
+		 var option=$(this).val();
+		 if(option!=0){ 
+				$("div[invoice]").show();
+				
+			}else{
+				$("div[invoice]").hide();
+			}
+		});
+	 
+	 $("input[publicRelationsInput]").keyup(function() {
+			var price=$(this).val();
+			if(price!=0){
+				$("tbody[publicRelations]").show();
+				$("span[publicRelationsPrice]").html(price);
+				
+				
+			}else{
+				$("tbody[publicRelations]").hide();
+			}
+		});
+	 
+	 $('tbody[invoiceList]').delegate( "a[node-invoice='INFO']",'click', function(){
+		 	var postData = $(this).attr("data-isKey");
+			var type =$(this).attr("data-type");
+			invoice(postData,type);
+			
+	 });
+	 
+	 $('div[invoice]').delegate( "a[node-invoice='INFO']",'click', function(){
+		 	var postData = $(this).attr("data-isKey");
+			var type =$(this).attr("data-type");
+			invoice(postData,type);
+			
+	 });
+	 
+	 
+	 $("button[search_invoice]").click(function() {
+		 var wd=$("input[wd]").val();
+		 
+		 var params = {
+			        where: {
+			        	'invoiceTitle_like':wd,
+			        	'untreadStatus_or':[0,3],
+			        	'status_or':[1,2],
+			        }
+			    };
+		
+		params = JSON.stringify(params);
+		 
+		 $.ajax({
+				url:'/api/invoice?filter='+params,
+				type: "get",
+				cache: false,
+				dataType: "json",
+				success: function(data){
+					buildInvoice(data);
+					
+				},
+				error:function(err){
+				}
+				});
+		 
+		});
+	 
+ })
+ function buildInvoice(data){
+	 var html='';
+	 for(var i=0;i<data.length;i++){
+		 html+='<tr><td>'+data[i]['invoiceTitle']+'</td><td>￥'+data[i]['invoicePrice'];
+		if(data[i]['invoiceType']==1){
+			 html+='专';
+		}
+		html+='</td>';
+		if(data[i]['settlementType']==1){
+			html+='<td>培训班（<a href="/invoiceTrainingDetail/'+data[i]['trainId']+'.html" target="_blank">查看</a>）</td>';
+		}else{
+			html+='<td>软件销售</td>';
+		}
+		
+		html+='<td>'+data[i]['categoryName']+''+data[i]['userName']+'<br> '+data[i]['date']+'</td><td>'+data[i]['printer']+'<br>'+data[i]['printTime']+'</td>';
+		html+='<td><a href="#invdetail" node-invoice="INFO" data-iskey="'+data[i]['iid']+'" data-toggle="modal">'+data[i]['invoiceSerial']+'</a></td>';
+		html+='<td><a class="button btn-block" data-dismiss="modal" aria-hidden="true" onclick="bind_invoice(\''+data[i]['iid']+'\',\''+data[i]['invoiceSerial']+'\')" href="#">添加</a></td></tr>';
+	}
+	$('tbody[invoiceList]').html(html);
+ 
+ }
+ function bind_invoice(iid,invoiceSerial){
+	 var html='<a href="#invdetail" node-invoice="INFO" data-iskey="'+iid+'" data-toggle="modal">'+invoiceSerial+'</a>';
+	 html+='<a href="#invdetail" onclick="remove_invoice()"  class="fR">移除</a>';
+	 $('#iid').val(iid);
+	 $('th[binded_invoce]').html(html);
+ }
+ 
+ function remove_invoice(){
+	 $('#iid').val('');
+	 $('th[binded_invoce]').html('');
+ }
+ 
+ function invoice(postData,type){
+	/*  var postData = $(this).attr("data-isKey");
+		var type =$(this).attr("data-type"); */
+		
+		var po='INVOICE';
+		if(type=='receivables')
+			po='RECEIVABLES';
+		
+		$("div[loading-msg='true']").html("<img src='/global/img/loadIco.gif' />");
+		var url = "/ajaxGetInvoiceInfoByType";
+		$.ajax({
+			url : url,
+			type : "post",
+			cache : false,
+			dataType : "json",
+			data : {
+				serial : postData,
+				type:po
+			},
+			global : true,
+			success : function(data) {
+				if (data.status == 1) {
+					$("div[loading-msg='true']").html("");
+					if(type=='receivables')
+						$("#nr").html(data.html);
+					else
+						$("#nc").html(data.html);
+				} else
+					$("div[loading-msg='true']").html("illegal request");
+			},
+			error : function(err) {
+				$("div[loading-msg='true']").html("");
+				$("#nr").html('');
+				$("#nc").html('');
+			}
+		});
+ }
+ 
+ </script>
+ 
+ <!--弹出（发票详情）-->
+     <div loading-msg='true' style="position:absolute;  left:50%;  top:50%;  "></div>
+	<div class="modal  fade" id="invdetail">
+		
+		<div id="nc"></div>
+	</div>
+
+	<div class="modal  fade" id="billing">
+		<div id="nr"></div>
+	</div>
+ 
+</body>

protected/view/receipt/feeInternalTrainApproval.html

@@ -0,0 +1,332 @@
+<!-- include '../admin/header' -->
+  <script src="<?= WEB_SITE_GLOBAL ?>js/receipt.js"></script>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<!-- include '../admin/receipt_menu' -->
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+				<div class="borad-news">
+				<legend><div class="fR"></div>
+				费用审批
+				</legend>
+
+				<div class="demandCate">
+				<input type="hidden" name="status" value="{{receiptList.0.status}}"></input>
+					<ul class="cateList">
+						<li><a href="/approvalExpenses/pendApproval">返回</a></li>
+						<li><a id="examine" data="{{rid}}" href="javascript:void(0)">查看下一份费用审批</a></li>
+	  			</ul>
+	  		</div>
+	  		
+	  		
+	  		<div class="saeaList">
+	  		
+	  			<!-- loop receiptList -->
+	  			<div id="{{receiptList' value.Locate}}"  class="entry <!-- if {{receiptList' value.Rtype}}==1 -->  loan-list <!-- elseif  {{receiptList' value.Rtype}}==0 --> receipt-list <!-- endif -->">
+	  			
+	  			
+	  			
+	  			<div class="seTable reportTable">
+	  			
+	  				<!-- if {{receiptList' value.Rtype}}==1 -->
+	  				<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+							<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次费用合计</b></td>
+							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+							</tr>
+							
+							<tr><th class="taC" colspan="2">费用说明</th>
+							</tr><tr><td colspan="2">{{explanation}}</td></tr>
+							
+							<tr><th colspan="2" class="taC">借款费用</th></tr>
+							
+							<!-- loop receiptList' value.loanItem.借款费用 -->
+	  							<tr><th>{{receiptList' value' value.name}}</th><td  width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+							
+							<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
+							<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
+							
+							
+							
+							
+							<tr class="warning" style="display:none"><td class="taR"><b>确认汇款金额</b></td>
+							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+							</tr>
+							
+							
+							<td class="taR"><b>本次借款</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+	  						</tr>
+	  						
+	  						<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"><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>
+	  					
+							
+							</tbody>
+						</table>
+				
+	  			<br/>
+	  				
+	  				<!-- endif -->
+	  				
+	  					
+	  					<table class="table table-bordered table-condensed table-hover">
+	  					<tbody>
+	  						
+	  						<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b></td></tr>
+	  						
+	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
+	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  						
+	  						
+	  						
+<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+	  						<!-- loop receiptList' value.accountItem.内部培训费用 -->
+	  						<tr><th>{{receiptDetail' value' value.name}}<div class="repMark fR"><i class="rmDone">●</i><i class="rmUdone">●</i><i class="rmClear">●</i></div></th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.trainSum}}</td></tr>
+							
+	  						
+	  						
+	  						
+	  						<!-- if {{status}}==2 -->
+	  						<tr><th colspan="2" class="taC">报销金额调整</th></tr>
+	  						<tr class="error"><td colspan="2" class="taR">
+	  						<form class="taR" style="margin:0" action="/revisePrice" method="post"  name="revisePrice_{{receiptList' value.rid}}">
+	  						<input type="text" name="description" placeholder="输入金额调整描述" class="span4"> ￥<span data-placement="top" data-toggle="ctooltip" data-original-title="扣款请在金额前加“-”">
+	  						<input type="number" name="price" placeholder="输入调整金额" pattern="[0-9]" step="0.01" class="span2"></span>
+	  						<input type="hidden" name="rid" value="{{receiptList' value.rid}}">
+	  						<input type="submit" value="添加" class="btn">
+	  						</form>
+	  						</td>
+	  						</tr>
+	  						<!-- elseif -->
+	  						<tr><th colspan="2" class="taC">报销金额调整</th></tr>
+	  						<!-- loop receiptList' value.reviseDetail -->
+	  						<tr><th><a href="/revocationAdjustment/{{receiptList' value' value.sidKey}}/{{receiptList' value' value.price}}/{{receiptList' value.ridKey}}/{{receiptList' value' value.reviseKey}}">撤销</a><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colOrange taR">￥{{receiptList' value.revisePrice}}</td></tr>
+	  						<!-- endif -->
+	  						
+	  						
+	  						
+	  						
+	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
+	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
+	  						
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
+							<tr><th>收款人户名</th>
+							<td>{{receiptDetail' value.remittanceName}}</td>
+							</tr>
+							<tr>
+							<th>收款银行</th>
+							<td>
+							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
+							广发银行
+							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
+							其他
+							<!-- endif -->
+							</td>
+							</tr>
+							<tr><th>收款开户银行名称</th><td>
+							{{receiptDetail' value.bankName}}
+							</td></tr>
+							<tr><th>收款账号</th><td>
+							{{receiptDetail' value.bankNumber}}
+							</td></tr>
+							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
+							<tr><th>联行号</th><td>
+							{{receiptDetail' value.coupletNumber}}
+							</td></tr>
+							<!-- endif -->
+	  						
+	  						
+	  						
+	  						
+	  						
+	  						<tr><th class="taC" colspan="2">附件</th>
+	  						</tr>
+	  						<tr><td colspan="2">
+	  						
+	  						{{enclosurHtml}}
+	  						
+	  						</td></tr>
+	  						
+	  						
+	  						
+
+						</tbody>
+	  					</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">
+				<!-- 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.relustABS}}
+				<!-- else -->
+				{{receiptDetail' value.sum}}
+				<!-- endif -->
+				</td></tr>
+				</tbody>
+			</table>
+		
+	  				
+	  				</div>
+	  				
+	  				<div class="seCensor <!-- if {{receiptList' value.Rtype}}==1 --> loan-censor <!-- else --> receipt-censor <!-- endif -->">
+	  					<form action="/updateApprovalReceipt" method="post" id="verifyOpinion_{{receiptList' value.rid}}" name="verifyOpinion_{{receiptList' value.rid}}">
+	  						<input type="hidden" id="status_{{receiptList' value.rid}}" name="status" value=""></input>
+	  						<input type="hidden" name="rid" value="{{receiptList' value.rid}}"></input>
+	  						<input type="hidden" name="Locate" value="{{receiptList' value.Locate}}"></input>
+	  						<input type="hidden" name="amount" value="{{receiptList' value.amount}}">
+		  					<div class="title">
+		  					{{receiptDetail' value.receiptOrder}}
+		  					</div>		  					
+		  					<div class="reportButton clearfix" style="display:" >
+		  					
+		  						<!-- if {{receiptDetail' value.button}}==4 -->
+		  						<a href="javascript:void(0)" onClick="updateApprovalReceipt(1,{{receiptList' value.rid}})" class="buttonDone buttonBlock">同意支付</a>
+		  						
+	  						
+		  						<!-- endif -->
+		  					</div>
+		  					<div class="censorList clearfix censorHeight">
+		  					<ul>
+		  					
+		  					<!-- if {{receiptList' value.Rtype}}==1 -->
+		  					<li class="post" >
+		  							<div class="avtra"><img src="{{receiptList' value.staffDetail.avatar}}_2.jpg" width="32"></div>
+		  							<div class="comment">
+		  								<p><span class="fR">{{loanReceiptDate}}</span>{{receiptList' value.staffDetail.username}}</p>
+		  								<p>提交审批</p>
+		  							</div>
+		  						</li>
+		  					
+		  					{{htmlLoan}}
+		  					
+		  					<!-- endif -->
+		  					
+		  					
+		  						<!-- if {{empty(receiptDetail' value.rlList)}} -->
+		  						<li class="post" >
+		  							<div class="avtra"><img src="{{receiptList' value.staffDetail.avatar}}_2.jpg" width="32"></div>
+		  							<div class="comment">
+		  								<p><span class="fR">
+		  								<!-- if {{receiptList' value.Rtype}}==1 -->
+		  								{{receiptList' value.date}}
+		  								
+		  								<!-- else -->
+		  								{{tijdate}}
+		  								<!-- endif -->
+		  								</span>{{receiptList' value.staffDetail.username}}</p>
+		  								<p>提交审批</p>
+		  							</div>
+		  						</li>
+		  						<!-- endif -->
+		  					
+		  						<!-- loop receiptDetail' value.rlList -->
+		  						<li  <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==4 --> class="back" <!-- elseif {{receiptDetail' value' value.status}}==2 --> class="post" <!-- endif --> >
+		  							<div class="avtra"><img src="{{receiptDetail' value' value.img}}_2.jpg" width="32"></div>
+		  							<div class="comment">
+		  								<p <!-- if {{receiptDetail' value' value.status}}!=2 --> class="colGray" <!-- endif --> ><span class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.username}} <!-- if {{receiptDetail' value' value.rolename}}!='' --> （{{receiptDetail' value' value.rolename}}） <!-- endif --></p>
+		  								<p>{{receiptDetail' value' value.opinion}}</p>
+		  							</div>
+		  						</li>
+		  						<!-- endloop -->
+		  						
+		  						<!-- loop receiptDetail' value.verifyList -->
+		  						
+		  						
+		  						<!-- if  {{receiptDetail' value' value.status}}!=1||{{empty(receiptDetail' value.rlList)}} -->
+			  						<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>
+			  							<!-- if {{receiptDetail' value' value.status}}==4 -->
+			  							<div class="comment">
+			  								{{receiptDetail' value' value.1}}<!-- if isset({{receiptDetail' value' value.rolename}}) --> （{{receiptDetail' value' value.rolename}}） <!-- endif -->
+			  								<p><textarea name="opinion" id="opinion_{{receiptList' value.rid}}" placeholder="填写审批意见（可选）"></textarea></p>
+			  							</div>
+			  							<!-- else -->
+			  							<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>
+			  								<p>{{receiptDetail' value' value.opinion}}</p>
+			  							</div>
+			  							<!-- endif -->
+			  						</li>
+		  						<!-- endif -->
+		  						
+		  						<!-- endloop -->
+		  						
+		  					</ul>
+		  					</div>
+					<div class="reportButton clearfix" style="display:" >
+		  					
+		  						<!-- if {{receiptDetail' value.button}}==4 -->
+		  						
+		  						<a href="javascript:void(0)" p-d="{{receiptList' value.rid}}" node-ReceiptBack="true" class="buttonBack <!-- if {{receiptList' value.Rtype}}==1 --> buttonBlock  <!-- endif -->" data-placement="top" data-toggle="ctooltip" data-original-title="上报人修改后由你继续审批">撤回</a>
+	  							<!-- if {{receiptList' value.Rtype}}!=1 -->
+	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(3,{{receiptList' value.rid}})" class="buttonUndone" data-placement="top" data-toggle="ctooltip" data-original-title="终止报销单">终止</a>
+	  							<!-- endif -->
+	  						
+		  						<!-- endif -->
+		  					</div>
+	  					</form>
+	  				</div>
+	  				
+	  			</div>
+	  		<!-- endloop -->
+	  		</div>
+	  		
+	  		</div>
+	  		
+			</div>
+		</div>
+	</div>
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/view/receipt/feeInternalTrainEdi.html

@@ -0,0 +1,346 @@
+<!-- include '../admin/header' -->
+
+ <link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css"> 
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
+ <script src="<?= WEB_SITE_GLOBAL ?>js/receipt.js"></script>
+ 
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="/" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<!-- include '../admin/receipt_menu' -->
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+		  		<div class="borad-news">
+					<legend><div class="fR"></div>申请报销单</legend>
+			  		<div class="saeaList">
+			  			<div class="entry receipt-list">
+			  				<div class="seTable">
+			  				
+			  				<form action="/updateReceipt" name="recepitAdd" method="post">
+			  				
+			  					<input type="hidden" name="rid" value="{{rid}}"/>
+			  				
+			  				
+			  					<table class="table table-bordered table-condensed table-hover">
+			  					<tbody>
+			  					
+			  						<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+	  						<!-- loop acItem -->
+		  					<!-- if {{acItem' value.category}} =="内部培训费用" -->
+	  						<tr>
+	  						<th>{{acItem' value.name}}</th>
+	  						<td  width="200" class="taR">
+	  						
+	  						￥<input type="number" id="inttrain_{{acItem' value.aid}}" name="inttrain[]" <!-- if !empty({{acItem' value.price}}) --> value="{{acItem' value.price}}" <!-- else --> value="0" <!-- endif --> placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2"></td>
+	  						</tr>
+	  							<!-- endif -->
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR" id="inttrainResult">￥{{cSum.inttrainSum}}</td></tr>
+
+
+
+			  				<tr class="warning"><td class="taR"><b>本次报销费用合计</b></td><td class="colGreed taR"><b style="font-size:24px" id="RS">￥{{sum}}</b></td></tr>
+	  								
+									
+									
+									<!-- if {{receiptDetail.status}}!=4 -->
+	  						<tr>
+								<th>选择审批组</th>
+								<td class="taR">
+								<select name="verify">
+								<!-- loop veList -->
+								<option <!-- if {{receiptDetail.verify}}=={{veList' value.vid}} --> selected <!-- endif --> value="{{veList' value.vid}}" >{{veList' value.description}}（
+								{{veList' value.staff}}）</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>
+	  						<!-- endif -->
+	  						<tr><th colspan="2" class="taC">产生费用所在办事处</th></tr>
+							<tr>
+								<th>选择办事处</th>
+								<td class="taR">
+								<select name="cid" class="span2">
+								<!-- loop category -->
+								<option <!-- if {{receiptDetail.cid}}=={{category' value.cid}} --> selected <!-- endif --> value="{{category' value.cid}}" >{{category' value.title}}</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>		
+	  						
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
+							<tr><th>收款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入收款人户名" ></td>
+							</tr>
+							<tr>
+							<th>收款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">广发银行</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							<tr><th>收款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入收款开户银行名称" >
+							</td></tr>
+							<tr><th>收款账号</th><td>
+							<input type="text" placeholder="请输入收款账号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
+							</td></tr>
+							<tr node-cn style="display:none" ><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是广发银行，务必填上银行联行号）</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
+							</td></tr>
+	  						
+	  						<tr><th colspan="2" class="taC">报销说明</th></tr>
+	  						<tr><th colspan="2">
+	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="市内交通费、邮寄费、公关费、办公费等费用说明，请详细填写在这。">{{receiptDetail.explanation}}</textarea>
+	  						</th></tr>
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">附件</th></tr>
+	  						<tr><td colspan="2">
+	  							
+	  							<!--已上传文件-->
+	  							<table class="table" >
+	  								<thead>
+	  								<tr>
+	  								<th>
+	  									<input enclosurFile type="file" 
+	  								accept="image/png,image/gif,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document
+	  								,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel" name="file" />
+	  								
+										<input type="hidden" id="enclosurName" name="enclosurName" value="">
+	  								
+	  								</th>
+	  								<th colspan="2">
+	  								<span class="fieldset flash" id="fsUploadProgress"></span>
+									<span id="divStatus">0 个文件已上传</span>
+									
+										
+	  								</th></tr>
+	  								<tr><th>文件名</th><th>大小</th><th>操作</th></tr></thead>
+	  								<tbody id="KT">
+	  								
+	  								<!-- loop enclosurList -->
+	  								<tr id="{{enclosurList' value.eidKey}}">
+	  								<td><a href="/upload/swfupload/{{enclosurList' value.name}}" target="_blank">{{enclosurList' value.name}}</a></td>
+	  								<td></td>
+	  								<td><a href="javascript:void(0)" onclick="delEnclosurByKey('{{enclosurList' value.eidKey}}')">删除</a></td>
+	  								</tr>
+	  								<!-- endloop -->
+	  								</tbody>
+	  							</table>		
+	  						</td></tr>
+	  						
+	  						
+	  						</tbody>
+			  					</table>
+			  					<table class="table">
+			  						<tr><td><input type="submit" value="生成报销单 >>" class="button" /></td></tr>
+			  					</table>
+			  					</form>
+			  				</div>
+			  				<div class="seCensor receipt-censor">
+			  					<div class="title">
+			  					报销单填写说明
+			  					</div>
+				  				<div class="detail">
+				  					<p>1 办事处水电费标准100元，标准内实报；</p>
+				  					<p>2 <b>产生费用所在办事处</b> 默认使用您所在的第一个办事处；</p>
+				  					<p>3 邮寄费、公关费、办公费等详细说明请填写到 <b>报销说明</b>。</p>
+			  					</div>
+			  				</div>
+			  			</div>
+					</div>
+				</div>
+		</div>
+	</div>
+	
+	
+
+	
+    <!--弹出内容-->
+<script type="text/javascript">autoFlashHeight();</script>
+<script >
+ $(function() {
+ 
+	 $("input[id^='inttrain_']").change(function() {
+			
+			$i=0;
+			$("input[id^='inttrain_']").each(function(i){
+				$i+=parseFloat(this.value);
+				
+			 });
+			$("#inttrainResult").html("￥"+$i.toFixed(2));
+			$("#inttrainR").val($i.toFixed(2));
+			
+			
+			var RS=parseFloat($i);
+		
+			$("#RS").html("￥"+RS.toFixed(2));
+		});
+	 
+	 $("select[bindInvoice]").change(function() {
+			
+		 var option=$(this).val();
+		 if(option!=0){ 
+				$("div[invoice]").show();
+				
+			}else{
+				$("div[invoice]").hide();
+			}
+		});
+	 
+	 $("input[publicRelationsInput]").keyup(function() {
+			var price=$(this).val();
+			if(price!=0){
+				$("tbody[publicRelations]").show();
+				$("span[publicRelationsPrice]").html(price);
+				
+				
+			}else{
+				$("tbody[publicRelations]").hide();
+			}
+		});
+	 
+	 $('tbody[invoiceList]').delegate( "a[node-invoice='INFO']",'click', function(){
+		 	var postData = $(this).attr("data-isKey");
+			var type =$(this).attr("data-type");
+			invoice(postData,type);
+			
+	 });
+	 
+	 $('div[invoice]').delegate( "a[node-invoice='INFO']",'click', function(){
+		 	var postData = $(this).attr("data-isKey");
+			var type =$(this).attr("data-type");
+			invoice(postData,type);
+			
+	 });
+	 
+	 
+	 $("button[search_invoice]").click(function() {
+		 var wd=$("input[wd]").val();
+		 
+		 var params = {
+			        where: {
+			        	'invoiceTitle_like':wd,
+			        	'untreadStatus_or':[0,3],
+			        	'status_or':[1,2],
+			        }
+			    };
+		
+		params = JSON.stringify(params);
+		 
+		 $.ajax({
+				url:'/api/invoice?filter='+params,
+				type: "get",
+				cache: false,
+				dataType: "json",
+				success: function(data){
+					buildInvoice(data);
+					
+				},
+				error:function(err){
+				}
+				});
+		 
+		});
+	 
+ })
+ function buildInvoice(data){
+	 var html='';
+	 for(var i=0;i<data.length;i++){
+		 html+='<tr><td>'+data[i]['invoiceTitle']+'</td><td>￥'+data[i]['invoicePrice'];
+		if(data[i]['invoiceType']==1){
+			 html+='专';
+		}
+		html+='</td>';
+		if(data[i]['settlementType']==1){
+			html+='<td>培训班（<a href="/invoiceTrainingDetail/'+data[i]['trainId']+'.html" target="_blank">查看</a>）</td>';
+		}else{
+			html+='<td>软件销售</td>';
+		}
+		
+		html+='<td>'+data[i]['categoryName']+''+data[i]['userName']+'<br> '+data[i]['date']+'</td><td>'+data[i]['printer']+'<br>'+data[i]['printTime']+'</td>';
+		html+='<td><a href="#invdetail" node-invoice="INFO" data-iskey="'+data[i]['iid']+'" data-toggle="modal">'+data[i]['invoiceSerial']+'</a></td>';
+		html+='<td><a class="button btn-block" data-dismiss="modal" aria-hidden="true" onclick="bind_invoice(\''+data[i]['iid']+'\',\''+data[i]['invoiceSerial']+'\')" href="#">添加</a></td></tr>';
+	}
+	$('tbody[invoiceList]').html(html);
+ 
+ }
+ function bind_invoice(iid,invoiceSerial){
+	 var html='<a href="#invdetail" node-invoice="INFO" data-iskey="'+iid+'" data-toggle="modal">'+invoiceSerial+'</a>';
+	 html+='<a href="#invdetail" onclick="remove_invoice()"  class="fR">移除</a>';
+	 $('#iid').val(iid);
+	 $('th[binded_invoce]').html(html);
+ }
+ 
+ function remove_invoice(){
+	 $('#iid').val('');
+	 $('th[binded_invoce]').html('');
+ }
+ 
+ function invoice(postData,type){
+	/*  var postData = $(this).attr("data-isKey");
+		var type =$(this).attr("data-type"); */
+		
+		var po='INVOICE';
+		if(type=='receivables')
+			po='RECEIVABLES';
+		
+		$("div[loading-msg='true']").html("<img src='/global/img/loadIco.gif' />");
+		var url = "/ajaxGetInvoiceInfoByType";
+		$.ajax({
+			url : url,
+			type : "post",
+			cache : false,
+			dataType : "json",
+			data : {
+				serial : postData,
+				type:po
+			},
+			global : true,
+			success : function(data) {
+				if (data.status == 1) {
+					$("div[loading-msg='true']").html("");
+					if(type=='receivables')
+						$("#nr").html(data.html);
+					else
+						$("#nc").html(data.html);
+				} else
+					$("div[loading-msg='true']").html("illegal request");
+			},
+			error : function(err) {
+				$("div[loading-msg='true']").html("");
+				$("#nr").html('');
+				$("#nc").html('');
+			}
+		});
+ }
+ 
+ </script>
+ 
+ <!--弹出（发票详情）-->
+     <div loading-msg='true' style="position:absolute;  left:50%;  top:50%;  "></div>
+	<div class="modal  fade" id="invdetail">
+		
+		<div id="nc"></div>
+	</div>
+
+	<div class="modal  fade" id="billing">
+		<div id="nr"></div>
+	</div>
+ 
+</body>

protected/view/receipt/feeLoanReceipt.html

@@ -0,0 +1,374 @@
+<!-- include '../admin/header' -->
+ <link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css"> 
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
+ <script src="<?= receipt ?>"></script>
+
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="/" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<!-- include '../admin/receipt_menu' -->
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+			
+			<div class="borad-news">
+				<legend><div class="fR"></div>借款报销费用详情</legend>
+				
+				<div class="saeaList ">
+	  			<!-- loop receiptList -->
+	  			<div class="entry loan-list">
+	  				
+	  			<div class="seTable">
+						<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+							<tr><th colspan="2" class="taC">借款费用</th></tr>
+							
+							<!-- loop receiptList' value.loanItem.借款费用 -->
+	  							<tr><th>{{receiptList' value' value.name}}</th><td  width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+							<tr><th>借款费用</th><td width="140" class="taR">￥{{receiptList' value.accountItem.cSum.loanSum}}</td></tr>
+							
+							<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
+							<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
+							<tr><th class="taC" colspan="2">费用说明</th>
+							</tr><tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+							
+							<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次费用合计</b></td>
+							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.BIGsum}}</td></tr>
+							</tbody>
+						</table>
+					</div>
+	  			
+	  				<div class="seCensor loan-censor">
+	  					
+	  				
+	  					<div class="title">
+	  					{{receiptDetail' value.receiptOrder}}
+	  					</div>
+	  					<div class="censorList">
+	  					<ul>
+		  						<li class="post">
+		  							<div class="avtra"><img src="{{staff.0.avatar}}_2.jpg" width="32"></div>
+		  							<div class="comment">
+		  								<p><span class="fR">{{receiptDetail' value.date}}</span>{{staff.0.username}}</p>
+		  								<p>提交审批</p>
+		  							</div>
+		  							
+		  						</li>
+		  						
+		  						
+		  						
+		  						
+		  						<!-- loop receiptDetail' value.verifyList -->
+		  						
+		  						
+		  						
+			  						<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"></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>
+			  								<p>{{receiptDetail' value' value.opinion}}</p>
+			  							</div>
+			  							
+			  						</li>
+		  						
+		  						
+		  						<!-- endloop -->
+		  						
+	  						
+	  					</ul>
+	  					
+	  					</div>
+	  					
+	  					
+	  				</div>
+	  			</div>
+	  			<!-- endloop -->
+	  			
+			</div>
+				
+				
+			
+				
+				
+	  		<div class="saeaList">
+	  			<div class="entry  loan-list">
+	  				<div class="seTable">
+	  				
+	  				<form action="/saeaLoanReceiptAddDo" name="recepitAdd" method="post">
+	  				<input type="hidden" id="agencyR" value="0" />
+	  				<input type="hidden" id="travelR" value="0" />
+	  				<input type="hidden" id="trainR" value="0" />
+	  				<input type="hidden" id="otherR" value="0" />
+	  					<input type="hidden" name='rid' value='{{rid}}' />
+	  					
+	  					<input type="hidden" name="itinerary" id="itinerary" value="" />
+	  					
+	  					<table class="table table-bordered table-condensed table-hover">
+	  					  
+	  					   <tr>
+								<th>选择报销类型</th>
+								<td class="taR">
+									<select name="receiptClass" selectReceiptClass >
+										<option <!-- if {{receiptClass}}=='agency' --> selected <!-- endif --> value="agency">办事处相关费用</option>
+										<option value="trave">差旅相关费用</option>
+										<option <!-- if {{receiptClass}}=='internalTrain' --> selected <!-- endif --> value="internalTrain">内部培训费用</option>
+									</select>
+								</td>
+							</tr>
+	  					   
+	  					   <tbody agency <!-- if !({{receiptClass}}==''||{{receiptClass}}=='agency') --> style="display:none" <!-- endif --> >
+	  						<tr><th colspan="2" class="taC">日常相关费用</th></tr>
+	  						<!-- loop acItem -->
+		  						<!-- if {{acItem' value.category}} =="日常相关费用" -->
+		  						<tr>
+		  						<th>{{acItem' value.name}}</th>
+		  						<td  width="200" class="taR">￥<input type="number" id="agency_{{acItem' value.aid}}" name="agency[]" value="0" placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2">
+		  						</td></tr>
+		  						<!-- endif -->
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR" id="agencyResult">￥0.00</td></tr>
+	  						
+	  						<tr><th colspan="2" class="taC">其他</th></tr>
+	  						<!-- loop acItem -->
+		  						<!-- if {{acItem' value.category}} =="其他" -->
+	  						<tr><th>{{acItem' value.name}}</th>
+	  						<td  width="200" class="taR">￥<input type="number" id="other_{{acItem' value.aid}}" name="other[]" value="0" placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2"></td></tr>
+	  							<!-- endif -->
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR" id="otherResult">￥0.00</td></tr>
+	  						</tbody>
+	  						
+	  						
+	  						
+	  						
+
+
+
+							<tbody  internalTrain <!-- if {{receiptClass}}!='internalTrain' --> style="display:none" <!-- endif --> >
+							<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+							<!-- loop acItem -->
+							<!-- if {{acItem' value.category}} =="内部培训费用" -->
+							<tr>
+								<th>{{acItem' value.name}}</th>
+								<td  width="200" class="taR">￥<input type="number" id="inttrain_{{acItem' value.aid}}" name="inttrain[]" value="0" placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2"></td>
+							</tr>
+							<!-- endif -->
+							<!-- endloop -->
+							<tr><th class="taR">合计</th><td class="colGreen taR" id="inttrainResult">￥0.00</td></tr>
+							</tbody>
+	  						
+	  						
+	  						
+	  						
+	  						
+	  						<tr class="warning"><td class="taR"><b>本次报销费用合计</b></td><td class="colGreed taR"><b style="font-size:24px" id="RS">￥0.00</b></td></tr>
+	  						
+	  						
+	  						<tr>
+								<th>选择审批组</th>
+								<td class="taR">
+								<select name="verify">
+								<option value="">请选择审批组</option>
+								<!-- loop veList -->
+								<option value="{{veList' value.vid}}" >{{veList' value.description}}（
+								{{veList' value.staff}}
+								
+								
+								）</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>
+	  						
+	  						
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">产生费用所在办事处</th></tr>
+							<tr>
+								<th>选择办事处</th>
+								<td class="taR">
+								<select name="cid" class="span2">
+								<!-- loop category -->
+								<option value="{{category' value.cid}}" <!-- if {{category' value.cid}} == {{staff.0.cid}}  --> selected <!-- endif --> >{{category' value.title}}</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>
+	  						
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
+							<tr><th>收款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入收款人户名" ></td>
+							</tr>
+							
+							<tr>
+							<th>收款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">广发银行</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							
+							<tr><th>收款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入收款开户银行名称" >
+							</td></tr>
+							<tr><th>收款账号</th><td>
+							<input type="text" placeholder="请输入收款账号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
+							</td></tr>
+							<tr node-cn style="display:none" ><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是广发银行，务必填上银行联行号）</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
+							</td></tr>
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">报销说明</th></tr>
+	  						<tr><th colspan="2">
+	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="市内交通费、邮寄费、公关费、办公费等费用说明，请详细填写在这。"></textarea>
+	  						</th></tr>
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">附件</th></tr>
+	  						<tr><td colspan="2">
+	  							
+	  							<!--已上传文件-->
+	  							<table class="table" >
+	  								<thead>
+	  								<tr>
+	  								<th>
+	  								
+	  								<input enclosurFile type="file" 
+	  								accept="image/png,image/gif,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document
+	  								,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel" name="file" />
+	  								
+									<input type="hidden" id="enclosurName" name="enclosurName" value="">
+	  								
+	  								</th>
+	  								<th colspan="2">
+	  								<span class="fieldset flash" id="fsUploadProgress"></span>
+									<span id="divStatus">0 个文件已上传</span>
+									
+										
+	  								</th></tr>
+	  								<tr><th>文件名</th><th>大小</th><th>操作</th></tr></thead>
+	  								<tbody id="KT">
+	  							<!--已上传文件-->
+	  								
+	  				</tbody>
+	  							</table>		
+	  						</td></tr>
+	  						
+	  					</table>
+	  					<table class="table">
+	  						<tr><td><input type="submit" value="生成报销单 >>" class="button" /></td></tr>
+	  					</table>
+	  				</form>	
+	  				</div>
+	  				<div class="seCensor loan-censor">
+	  					<div class="title">
+	  					报销单填写说明
+	  					</div>
+	  					<div class="detail">
+		  					<p>1 请按先后发生顺序填写报销明细，交通费（市内交通费及往来交通费）、邮寄费需在批注明注明费用明细（例：珠海-广州70元-佛山20元）；</p>
+		  					<p>2 出差补助30元/天，不需提供发票，只需在报销单上填写清楚；</p>
+		  					<p>3 办事处水电费标准100元，标准内实报；</p>
+		  					<p>4 <b>产生费用所在办事处</b> 默认使用您所在的第一个办事处；</p>
+		  					<p>5 市内交通费、邮寄费、公关费、办公费等详细说明请填写到 <b>报销说明</b>。</p>
+	  					</div>
+	  				</div>
+	  			</div>
+			</div>
+			
+			
+			</div>
+			
+			
+		</div>
+	</div>
+ 
+<script >
+
+function resetPageData(){
+	$("input[id^='inttrain_']").each(function(i){
+		$(this).val(0);
+	 });
+	$("input[id^='travel']").each(function(i){
+		$(this).val(0);
+	 });
+	$("input[id^='agency_']").each(function(i){
+		$(this).val(0);
+	 });
+	$("input[id^='other_']").each(function(i){
+		$(this).val(0);
+	 });
+	$('#agencyResult').html(0.00);
+	$('#otherResult').html(0.00);
+	$('#travelResult').html(0.00);
+	$('#inttrainResult').html(0.00);
+	$('#RS').html(0);
+}
+
+ $(function() {
+ 
+	 $("input[id^='inttrain_']").change(function() {
+			
+			$i=0;
+			$("input[id^='inttrain_']").each(function(i){
+				$i+=parseFloat(this.value);
+				
+			 });
+			$("#inttrainResult").html("￥"+$i.toFixed(2));
+			$("#inttrainR").val($i.toFixed(2));
+			
+			var agencyR=$("#agencyR").val();
+			var otherR=parseFloat($("#otherR").val());
+			var travelR=parseFloat($("#travelR").val());
+			var RS=parseFloat($i)+parseFloat(agencyR)+travelR+otherR;
+			
+			$("#RS").html("￥"+RS.toFixed(2));
+		});
+	 
+	 $("select[selectReceiptClass]").change(function() {
+		 let receiptClass=$(this).val();
+		 resetPageData();
+		 $('tbody[agency]').hide();
+		 $('tbody[trave]').hide();
+		 $('tbody[internalTrain]').hide();
+		 let id=$('input[name=rid]').val();
+		 if(receiptClass==='agency'){
+			 $('tbody[agency]').show();
+		 }else if(receiptClass==='trave'){
+			 window.location.href="/saeaLoanReceiptAdd/"+id+"?receiptClass=trave"
+			 $('tbody[trave]').show();
+		 }else if(receiptClass==='internalTrain'){
+			 $('tbody[internalTrain]').show();
+		 }
+		 
+	 });
+	 
+	 
+ })
+ </script>
+ 
+    
+    
+    
+    
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/view/receipt/feeLoanReceiptAgencyEdi.html

@@ -0,0 +1,309 @@
+<!-- include '../admin/header' -->
+  <link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css"> 
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
+ <script src="<?= WEB_SITE_GLOBAL ?>js/receipt.js"></script>
+
+ <script >
+	 $(function() {
+
+		 $("input[id^='inttrain_']").change(function() {
+
+			 $i=0;
+			 $("input[id^='inttrain_']").each(function(i){
+				 $i+=parseFloat(this.value);
+
+			 });
+			 $("#inttrainResult").html("￥"+$i.toFixed(2));
+			 $("#inttrainR").val($i.toFixed(2));
+
+			 var agencyR=$("#agencyR").val();
+			 var otherR=parseFloat($("#otherR").val());
+			 var travelR=parseFloat($("#travelR").val());
+			 var RS=parseFloat($i)+parseFloat(agencyR)+travelR+otherR;
+
+			 $("#RS").html("￥"+RS.toFixed(2));
+		 });
+
+	 })
+ </script>
+
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<!-- include '../admin/receipt_menu' -->
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+				
+				
+				<div class="borad-news">
+				
+				
+				<legend><div class="fR"></div>编辑报销单</legend>
+				
+				
+				
+				<div class="saeaList ">
+	  			<!-- loop receiptList -->
+	  			<div class="entry loan-list" >
+	  			<!-- 
+	  				<!-- if {{receiptList' value.status}}==1 -->
+	  				<div class="seal done"></div>
+	  				<!-- elseif {{receiptList' value.status}}==3 -->
+	  				<div class="seal undone"></div>	
+	  				<!-- elseif {{receiptList' value.status}}==4 -->
+	  				<div class="seal back"></div>	
+	  				<!-- endif -->
+	  				 -->
+	  				
+	  				
+	  			
+	  			<div class="seTable">
+						<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+							<tr><th colspan="2" class="taC">借款费用</th></tr>
+							
+							<!-- loop receiptList' value.loanItem.借款费用 -->
+	  							<tr><th>{{receiptList' value' value.name}}</th><td  width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+							<tr><th>借款费用</th><td width="140" class="taR">￥{{receiptList' value.accountItem.cSum.loanSum}}</td></tr>
+							
+							<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
+							<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
+							<tr><th class="taC" colspan="2">费用说明</th>
+							</tr><tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+							
+							<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次费用合计</b></td>
+							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.BIGsum}}</td></tr>
+							</tbody>
+						</table>
+					</div>
+	  			
+	  			
+	  			
+	  			
+	  				
+	  				<div class="seCensor loan-censor">
+	  					
+	  				
+	  					<div class="title">
+	  					{{receiptDetail' value.receiptOrder}}
+	  					</div>
+	  					<div class="censorList">
+	  					<ul>
+		  						<li class="post">
+		  							<div class="avtra"><img src="{{staff.0.avatar}}_2.jpg" width="32"></div>
+		  							<div class="comment">
+		  								<p><span class="fR">{{receiptDetail' value.date}}</span>{{staff.0.username}}</p>
+		  								<p>提交审批</p>
+		  							</div>
+		  							
+		  						</li>
+		  						
+		  						
+		  						
+		  						
+		  						<!-- loop receiptDetail' value.verifyList -->
+		  						
+		  						
+		  						
+			  						<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"></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>
+			  								<p>{{receiptDetail' value' value.opinion}}</p>
+			  							</div>
+			  							
+			  						</li>
+		  						
+		  						
+		  						<!-- endloop -->
+		  						
+	  						
+	  					</ul>
+	  					
+	  					</div>
+	  					
+	  					
+	  				</div>
+	  			</div>
+	  			<!-- endloop -->
+	  			
+			</div>
+				
+				
+				
+				
+				
+				
+				
+				
+	  		<div class="saeaList">
+	  			<div class="entry">
+	  				<div class="seTable">
+	  				<input type="hidden" id="agencyR" value="{{cSum.agencySum}}" />
+	  				<input type="hidden" id="travelR" value="{{cSum.travelSum}}" />
+	  				<input type="hidden" id="trainR" value="{{cSum.trainSum}}" />
+	  				<input type="hidden" id="otherR" value="{{cSum.otherSum}}" />
+	  				<form action="/updateReceipt" name="recepitAdd" method="post">
+	  					<input type="hidden" name="rid" value="{{ridKey}}"/>
+	  					<table class="table table-bordered table-condensed table-hover">
+	  					<tbody>
+	  					   
+	  						<tr><th colspan="2" class="taC">日常相关费用</th></tr>
+	  						<!-- loop acItem -->
+		  						<!-- if {{acItem' value.category}} =="日常相关费用" -->
+		  						<tr>
+		  						<th>{{acItem' value.name}}</th>
+		  						<td  width="200" class="taR">
+		  						￥<input type="number" <!-- if !empty({{acItem' value.price}}) --> value="{{acItem' value.price}}" <!-- else --> value="0" <!-- endif --> id="agency_{{acItem' value.aid}}" name="agency[]"  placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2">
+		  						</td>
+		  						</tr>
+		  						<!-- endif -->
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR" id="agencyResult">￥{{cSum.agencySum}}</td></tr>
+	  						
+	  						
+	  						
+
+
+
+
+							
+	  						
+	  						<tr><th colspan="2" class="taC">其他</th></tr>
+	  						<!-- loop acItem -->
+		  						<!-- if {{acItem' value.category}} =="其他" -->
+	  						<tr><th>{{acItem' value.name}}</th>
+	  						<td  width="200" class="taR">￥<input type="number" id="other_{{acItem' value.aid}}" name="other[]" <!-- if !empty({{acItem' value.price}}) --> value="{{acItem' value.price}}" <!-- else --> value="0" <!-- endif --> placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2"></td></tr>
+	  							<!-- endif -->
+	  						<!-- endloop -->
+	  						
+	  						<tr><th class="taR">合计</th><td class="colGreen taR" id="otherResult">￥{{cSum.otherSum}}</td></tr>
+	  						
+	  						<tr class="warning"><td class="taR"><b>本次报销费用合计</b></td><td class="colGreed taR"><b style="font-size:24px" id="RS">￥{{sum}}</b></td></tr>
+	  						<tr>
+								<th>选择审批组</th>
+								<td class="taR">
+								<select name="verify">
+								<!-- loop veList -->
+								<option <!-- if {{receiptDetail.verify}}=={{veList' value.vid}} --> selected <!-- endif --> value="{{veList' value.vid}}" >{{veList' value.description}}（
+								{{veList' value.staff}}
+								
+								
+								）</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>
+	  						
+	  						<tr><th colspan="2" class="taC">产生费用所在办事处</th></tr>
+							<tr>
+								<th>选择办事处</th>
+								<td class="taR">
+								<select name="cid" class="span2">
+								<!-- loop category -->
+								<option <!-- if {{receiptDetail.cid}}=={{category' value.cid}} --> selected <!-- endif --> value="{{category' value.cid}}" >{{category' value.title}}</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>	
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
+							<tr><th>收款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入收款人户名" ></td>
+							</tr>
+							
+							<tr>
+							<th>收款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">广发银行</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							
+							<tr><th>收款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入收款开户银行名称" >
+							</td></tr>
+							<tr><th>收款账号</th><td>
+							<input type="text" placeholder="请输入收款账号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
+							</td></tr>
+							<tr node-cn style="display:none" ><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是广发银行，务必填上银行联行号）</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
+							</td></tr>
+	  						
+	  						<tr><th colspan="2" class="taC">报销说明</th></tr>
+	  						<tr><th colspan="2">
+	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="市内交通费、邮寄费、公关费、办公费等费用说明，请详细填写在这。">{{receiptDetail.explanation}}</textarea>
+	  						</th></tr>
+	  						
+	  						
+	  						</tbody>
+	  					</table>
+	  					<table class="table">
+	  						<tr><td><input type="submit" value="生成报销单 >>" class="button" /></td></tr>
+	  					</table>
+	  				</form>	
+	  				</div>
+	  				<div class="seCensor">
+	  					<div class="title">
+	  					报销单填写说明
+	  					</div>
+	  				</div>
+	  			</div>
+			</div>
+			
+			</div>
+			
+			
+			
+		</div>
+	
+	
+	
+	
+	
+	
+	</div>
+	<!--弹出-->
+<div class="modal hide fade" id="addCallout">
+    <div class="modal-header">
+    <h3>添加批注</h3>
+    </div>
+    <div class="modal-body">
+    <form class="">
+	    	<div class="control-group">
+				<div class="controls clearfix">
+					<label>
+	                	批注内容
+	              	</label>
+	              	<textarea rows="8" class="span6"></textarea>
+				</div>
+	    	</div>
+    </form>
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">取消</a>
+	   	<a href="#" class="button">确定</a>
+	</div>
+</div>
+    <!--弹出内容-->
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/view/receipt/feeLoanReceiptITEdi.html

@@ -0,0 +1,295 @@
+<!-- include '../admin/header' -->
+  <link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css"> 
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
+ <script src="<?= WEB_SITE_GLOBAL ?>js/receipt.js"></script>
+
+ <script >
+	 $(function() {
+
+		 $("input[id^='inttrain_']").change(function() {
+
+			 $i=0;
+			 $("input[id^='inttrain_']").each(function(i){
+				 $i+=parseFloat(this.value);
+
+			 });
+			 $("#inttrainResult").html("￥"+$i.toFixed(2));
+			 $("#inttrainR").val($i.toFixed(2));
+
+			 var agencyR=$("#agencyR").val();
+			 var otherR=parseFloat($("#otherR").val());
+			 var travelR=parseFloat($("#travelR").val());
+			 var RS=parseFloat($i)+parseFloat(agencyR)+travelR+otherR;
+
+			 $("#RS").html("￥"+RS.toFixed(2));
+		 });
+
+	 })
+ </script>
+
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<!-- include '../admin/receipt_menu' -->
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+			
+			
+			<div class="borad-news">
+			
+			
+				<legend><div class="fR"></div>编辑报销单</legend>
+				
+				
+				
+				<div class="saeaList ">
+	  			<!-- loop receiptList -->
+	  			<div class="entry loan-list" >
+	  			<!-- 
+	  				<!-- if {{receiptList' value.status}}==1 -->
+	  				<div class="seal done"></div>
+	  				<!-- elseif {{receiptList' value.status}}==3 -->
+	  				<div class="seal undone"></div>	
+	  				<!-- elseif {{receiptList' value.status}}==4 -->
+	  				<div class="seal back"></div>	
+	  				<!-- endif -->
+	  				 -->
+	  				
+	  				
+	  			
+	  			<div class="seTable">
+						<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+							<tr><th colspan="2" class="taC">借款费用</th></tr>
+							
+							<!-- loop receiptList' value.loanItem.借款费用 -->
+	  							<tr><th>{{receiptList' value' value.name}}</th><td  width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+							<tr><th>借款费用</th><td width="140" class="taR">￥{{receiptList' value.accountItem.cSum.loanSum}}</td></tr>
+							
+							<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
+							<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
+							<tr><th class="taC" colspan="2">费用说明</th>
+							</tr><tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+							
+							<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次费用合计</b></td>
+							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.BIGsum}}</td></tr>
+							</tbody>
+						</table>
+					</div>
+	  			
+	  			
+	  			
+	  			
+	  				
+	  				<div class="seCensor loan-censor">
+	  					
+	  				
+	  					<div class="title">
+	  					{{receiptDetail' value.receiptOrder}}
+	  					</div>
+	  					<div class="censorList">
+	  					<ul>
+		  						<li class="post">
+		  							<div class="avtra"><img src="{{staff.0.avatar}}_2.jpg" width="32"></div>
+		  							<div class="comment">
+		  								<p><span class="fR">{{receiptDetail' value.date}}</span>{{staff.0.username}}</p>
+		  								<p>提交审批</p>
+		  							</div>
+		  							
+		  						</li>
+		  						
+		  						
+		  						
+		  						
+		  						<!-- loop receiptDetail' value.verifyList -->
+		  						
+		  						
+		  						
+			  						<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"></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>
+			  								<p>{{receiptDetail' value' value.opinion}}</p>
+			  							</div>
+			  							
+			  						</li>
+		  						
+		  						
+		  						<!-- endloop -->
+		  						
+	  						
+	  					</ul>
+	  					
+	  					</div>
+	  					
+	  					
+	  				</div>
+	  			</div>
+	  			<!-- endloop -->
+	  			
+			</div>
+				
+				
+				
+				
+				
+				
+				
+				
+	  		<div class="saeaList">
+	  			<div class="entry">
+	  				<div class="seTable">
+	  				<input type="hidden" id="agencyR" value="{{cSum.agencySum}}" />
+	  				<input type="hidden" id="travelR" value="{{cSum.travelSum}}" />
+	  				<input type="hidden" id="trainR" value="{{cSum.trainSum}}" />
+	  				<input type="hidden" id="otherR" value="{{cSum.otherSum}}" />
+	  				<form action="/updateReceipt" name="recepitAdd" method="post">
+	  					<input type="hidden" name="rid" value="{{ridKey}}"/>
+	  					<table class="table table-bordered table-condensed table-hover">
+	  					<tbody>
+	  					   
+	  						
+	  						
+	  						
+	  						
+
+
+							<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+							<!-- loop acItem -->
+							<!-- if {{acItem' value.category}} =="内部培训费用" -->
+							<tr>
+								<th>{{acItem' value.name}}</th>
+								<td  width="200" class="taR">
+
+									￥<input type="number" id="inttrain_{{acItem' value.aid}}" name="inttrain[]" <!-- if !empty({{acItem' value.price}}) --> value="{{acItem' value.price}}" <!-- else --> value="0" <!-- endif --> placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2"></td>
+							</tr>
+							<!-- endif -->
+							<!-- endloop -->
+							<tr><th class="taR">合计</th><td class="colGreen taR" id="inttrainResult">￥{{cSum.inttrainSum}}</td></tr>
+
+
+							
+	  						
+	  						
+	  						
+	  						<tr class="warning"><td class="taR"><b>本次报销费用合计</b></td><td class="colGreed taR"><b style="font-size:24px" id="RS">￥{{sum}}</b></td></tr>
+	  						<tr>
+								<th>选择审批组</th>
+								<td class="taR">
+								<select name="verify">
+								<!-- loop veList -->
+								<option <!-- if {{receiptDetail.verify}}=={{veList' value.vid}} --> selected <!-- endif --> value="{{veList' value.vid}}" >{{veList' value.description}}（
+								{{veList' value.staff}}
+								
+								
+								）</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>
+	  						
+	  						<tr><th colspan="2" class="taC">产生费用所在办事处</th></tr>
+							<tr>
+								<th>选择办事处</th>
+								<td class="taR">
+								<select name="cid" class="span2">
+								<!-- loop category -->
+								<option <!-- if {{receiptDetail.cid}}=={{category' value.cid}} --> selected <!-- endif --> value="{{category' value.cid}}" >{{category' value.title}}</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>	
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
+							<tr><th>收款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入收款人户名" ></td>
+							</tr>
+							
+							<tr>
+							<th>收款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">广发银行</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							
+							<tr><th>收款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入收款开户银行名称" >
+							</td></tr>
+							<tr><th>收款账号</th><td>
+							<input type="text" placeholder="请输入收款账号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
+							</td></tr>
+							<tr node-cn style="display:none" ><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是广发银行，务必填上银行联行号）</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
+							</td></tr>
+	  						
+	  						<tr><th colspan="2" class="taC">报销说明</th></tr>
+	  						<tr><th colspan="2">
+	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="市内交通费、邮寄费、公关费、办公费等费用说明，请详细填写在这。">{{receiptDetail.explanation}}</textarea>
+	  						</th></tr>
+	  						
+	  						
+	  						</tbody>
+	  					</table>
+	  					<table class="table">
+	  						<tr><td><input type="submit" value="生成报销单 >>" class="button" /></td></tr>
+	  					</table>
+	  				</form>	
+	  				</div>
+	  				<div class="seCensor">
+	  					<div class="title">
+	  					报销单填写说明
+	  					</div>
+	  				</div>
+	  			</div>
+			</div>
+			
+			
+			</div>
+			
+		</div>
+	</div>
+	<!--弹出-->
+<div class="modal hide fade" id="addCallout">
+    <div class="modal-header">
+    <h3>添加批注</h3>
+    </div>
+    <div class="modal-body">
+    <form class="">
+	    	<div class="control-group">
+				<div class="controls clearfix">
+					<label>
+	                	批注内容
+	              	</label>
+	              	<textarea rows="8" class="span6"></textarea>
+				</div>
+	    	</div>
+    </form>
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">取消</a>
+	   	<a href="#" class="button">确定</a>
+	</div>
+</div>
+    <!--弹出内容-->
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/view/receipt/feeLoanReceiptTrave.html

@@ -0,0 +1,752 @@
+<!-- include '../admin/header' -->
+ <link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css"> 
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
+ <script src="<?= receipt ?>"></script>
+
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="/" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<!-- include '../admin/receipt_menu' -->
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+			
+			<div class="borad-news">
+			
+			
+				<legend><div class="fR"></div>借款报销费用详情</legend>
+				
+				<div class="saeaList ">
+	  			<!-- loop receiptList -->
+	  			<div class="entry loan-list">
+	  				
+	  			<div class="seTable">
+						<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+							<tr><th colspan="2" class="taC">借款费用</th></tr>
+							
+							<!-- loop receiptList' value.loanItem.借款费用 -->
+	  							<tr><th>{{receiptList' value' value.name}}</th><td  width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+							<tr><th>借款费用</th><td width="140" class="taR">￥{{receiptList' value.accountItem.cSum.loanSum}}</td></tr>
+							
+							<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
+							<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
+							<tr><th class="taC" colspan="2">费用说明</th>
+							</tr><tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+							
+							<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次费用合计</b></td>
+							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.BIGsum}}</td></tr>
+							</tbody>
+						</table>
+					</div>
+	  			
+	  				<div class="seCensor loan-censor">
+	  					
+	  				
+	  					<div class="title">
+	  					{{receiptDetail' value.receiptOrder}}
+	  					</div>
+	  					<div class="censorList">
+	  					<ul>
+		  						<li class="post">
+		  							<div class="avtra"><img src="{{staff.0.avatar}}_2.jpg" width="32"></div>
+		  							<div class="comment">
+		  								<p><span class="fR">{{receiptDetail' value.date}}</span>{{staff.0.username}}</p>
+		  								<p>提交审批</p>
+		  							</div>
+		  							
+		  						</li>
+		  						
+		  						<!-- loop receiptDetail' value.verifyList -->
+		  						
+			  						<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"></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>
+			  								<p>{{receiptDetail' value' value.opinion}}</p>
+			  							</div>
+			  							
+			  						</li>
+		  						
+		  						<!-- endloop -->
+		  						
+	  					</ul>
+	  					
+	  					</div>
+	  					
+	  					
+	  				</div>
+	  			</div>
+	  			<!-- endloop -->
+	  			
+			</div>
+				
+				
+				
+	  		<div class="saeaList">
+	  			<div class="entry  loan-list">
+	  				<div class="seTable">
+	  				
+	  				<form action="/saeaLoanReceiptAddDo" name="recepitAdd" method="post">
+	  				<input type="hidden" id="agencyR" value="0" />
+	  				<input type="hidden" id="travelR" value="0" />
+	  				<input type="hidden" id="trainR" value="0" />
+	  				<input type="hidden" id="otherR" value="0" />
+	  					<input type="hidden" name='rid' value='{{rid}}' />
+	  					
+	  					<input type="hidden" name="itinerary" id="itinerary" value="" />
+	  					
+	  					<table class="table table-bordered table-condensed table-hover">
+	  					  
+	  					   <tr>
+								<th>选择报销类型</th>
+								<td class="taR">
+									<select name="receiptClass" selectReceiptClass >
+										<option value="agency">办事处相关费用</option>
+										<option selected value="trave">差旅相关费用</option>
+										<option value="internalTrain">内部培训费用</option>
+									</select>
+								</td>
+							</tr>
+	  					   
+	  					   <tr>
+											<th colspan="2" class="taC">行程详细</th>
+										</tr>
+										<tbody itinerary >
+											
+
+											
+										</tbody>
+
+
+										<tr>
+											<th colspan="2" class="taC"><a href="#route-add"
+												class="button" addStroke data-toggle="modal">设置行程费用单</a></th>
+										</tr>
+	  						
+	  						
+	  						
+	  						
+	  						<tbody trave >
+	  						<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
+	  						<!-- loop acItem -->
+		  						<!-- if {{acItem' value.category}} =="差旅相关费用" -->
+	  						<tr>
+	  						<th>{{acItem' value.name}}</th>
+	  						<td  width="200" class="taR">￥<span travelPrice_{{acItem' value.aid}} >0</span><input type="hidden" id="travel_{{acItem' value.aid}}" name="travel[]" value="0" placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2"></td>
+	  						</tr>
+	  							<!-- endif -->
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR" id="travelResult">￥0.00</td></tr>
+							</tbody>
+
+
+	  						
+	  						<tr class="warning"><td class="taR"><b>本次报销费用合计</b></td><td class="colGreed taR"><b style="font-size:24px" id="RS">￥0.00</b></td></tr>
+	  						
+	  						
+	  						<tr>
+								<th>选择审批组</th>
+								<td class="taR">
+								<select name="verify">
+								<option value="">请选择审批组</option>
+								<!-- loop veList -->
+								<option value="{{veList' value.vid}}" >{{veList' value.description}}（
+								{{veList' value.staff}}
+								
+								
+								）</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>
+	  						
+	  						
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">产生费用所在办事处</th></tr>
+							<tr>
+								<th>选择办事处</th>
+								<td class="taR">
+								<select name="cid" class="span2">
+								<!-- loop category -->
+								<option value="{{category' value.cid}}" <!-- if {{category' value.cid}} == {{staff.0.cid}}  --> selected <!-- endif --> >{{category' value.title}}</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>
+	  						
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
+							<tr><th>收款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入收款人户名" ></td>
+							</tr>
+							
+							<tr>
+							<th>收款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">广发银行</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							
+							<tr><th>收款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入收款开户银行名称" >
+							</td></tr>
+							<tr><th>收款账号</th><td>
+							<input type="text" placeholder="请输入收款账号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
+							</td></tr>
+							<tr node-cn style="display:none" ><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是广发银行，务必填上银行联行号）</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
+							</td></tr>
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">报销说明</th></tr>
+	  						<tr><th colspan="2">
+	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="市内交通费、邮寄费、公关费、办公费等费用说明，请详细填写在这。"></textarea>
+	  						</th></tr>
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">附件</th></tr>
+	  						<tr><td colspan="2">
+	  							
+	  							<!--已上传文件-->
+	  							<table class="table" >
+	  								<thead>
+	  								<tr>
+	  								<th>
+	  								
+	  								<input enclosurFile type="file" 
+	  								accept="image/png,image/gif,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document
+	  								,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel" name="file" />
+	  								
+									<input type="hidden" id="enclosurName" name="enclosurName" value="">
+	  								
+	  								</th>
+	  								<th colspan="2">
+	  								<span class="fieldset flash" id="fsUploadProgress"></span>
+									<span id="divStatus">0 个文件已上传</span>
+									
+										
+	  								</th></tr>
+	  								<tr><th>文件名</th><th>大小</th><th>操作</th></tr></thead>
+	  								<tbody id="KT">
+	  							<!--已上传文件-->
+	  								
+	  				</tbody>
+	  							</table>		
+	  						</td></tr>
+	  						
+	  					</table>
+	  					<table class="table">
+	  						<tr><td><input type="submit" value="生成报销单 >>" class="button" /></td></tr>
+	  					</table>
+	  				</form>	
+	  				</div>
+	  				<div class="seCensor loan-censor">
+	  					<div class="title">
+	  					报销单填写说明
+	  					</div>
+	  					<div class="detail">
+		  					<p>1 请按先后发生顺序填写报销明细，交通费（市内交通费及往来交通费）、邮寄费需在批注明注明费用明细（例：珠海-广州70元-佛山20元）；</p>
+		  					<p>2 出差补助30元/天，不需提供发票，只需在报销单上填写清楚；</p>
+		  					<p>3 办事处水电费标准100元，标准内实报；</p>
+		  					<p>4 <b>产生费用所在办事处</b> 默认使用您所在的第一个办事处；</p>
+		  					<p>5 市内交通费、邮寄费、公关费、办公费等详细说明请填写到 <b>报销说明</b>。</p>
+	  					</div>
+	  					
+	  					<div class="itinerary">
+			  						<h2 class="itineraryTitle">总行程单</h2>
+			  						<div class="itineraryCon" >
+			  							<ul itineraryinfo>
+			  								
+			  							</ul>
+			  						</div>
+			  					</div>
+	  					
+	  				</div>
+	  			</div>
+			</div>
+			
+			
+			</div>
+			
+			
+		</div>
+	</div>
+ 
+ <!--弹出 添加行程 -->
+		<div class="modal hide fade" id="route-add">
+			<div class="modal-dialog">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h3>设置行程费用单</h3>
+					</div>
+					<div class="modal-body saeaList">
+						<input type="hidden" name="ediStrokeId" >
+						<table class="table table-bordered table-condensed">
+							<tr>
+								<th class="taC" colspan="4">出发-到达</th>
+							</tr>
+							<tr>
+								<th>出发地</th>
+								<td>
+								<select departureProvince >
+								
+								</select>
+								<select departureCity>
+								
+								</select>
+								</td>
+								<th>到达地</th>
+								<td>
+								<select arrivalsProvince ></select>
+								<select arrivalsCity></select>
+								</td>
+							</tr>
+							<tr>
+								<th>出发日期</th>
+								<td><input type="date" departureDate ></td>
+								<th>到达日期</th>
+								<td><input type="date" arrivalsDate ></td>
+							</tr>
+							<tr>
+								<td colspan="4" class="colGray">如果是停留，出发地和到达地填写住宿地。（如：广东省珠海市-广东省珠海市）</td>
+							</tr>
+						</table>
+						<select feeTravelItem >
+						
+						<!-- loop acItem -->
+										<!-- if {{acItem' value.category}} =="差旅相关费用" -->
+										<option value='{{acItem' value.aid}}'>{{acItem' value.name}}</option>
+										
+										<!-- endif -->
+						<!-- endloop -->
+						
+						
+							</select><a href="#" feeTravelItem class="button">添加费用</a>
+						<table class="table table-bordered table-condensed">
+							<tr>
+								<th colspan="4" class="taC">费用详情</th>
+							</tr>
+							<tbody feeTravelItem >
+							</tbody>
+							
+						</table>
+					</div>
+					<div class="modal-footer">
+						<a href="#" addItineraryBut class="button" data-dismiss="modal" aria-hidden="true">确认</a>
+						<a href="#" ediItineraryBut style="display:none" class="button" data-dismiss="modal" aria-hidden="true">确认</a>
+						<a href="#" class="button btn-gray" data-dismiss="modal"
+							aria-hidden="true">关闭</a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!--结束 弹出 添加行程 -->
+ 
+ <script type="text/javascript">
+			
+			var sessionStorageList='itineraryListLoan';
+		</script>
+ <script src="<?= itinerary ?>"></script>
+ 
+<script >
+
+function resetPageData(){
+	$("input[id^='inttrain_']").each(function(i){
+		$(this).val(0);
+	 });
+	$("input[id^='travel']").each(function(i){
+		$(this).val(0);
+	 });
+	$("input[id^='agency_']").each(function(i){
+		$(this).val(0);
+	 });
+	$("input[id^='other_']").each(function(i){
+		$(this).val(0);
+	 });
+	$('#agencyResult').html(0.00);
+	$('#otherResult').html(0.00);
+	$('#travelResult').html(0.00);
+	$('#inttrainResult').html(0.00);
+	$('#RS').html(0);
+}
+
+/* function fnTotTravelPrice(){
+	var itineraryStr=sessionStorage.getItem("itineraryListLoan");
+	var sessionItinerary= JSON.parse(itineraryStr);
+	$("#itinerary").val(itineraryStr);
+	var priceList=[];
+	for(let i=0;i<sessionItinerary.length;i++){
+		let feeTraveItem=sessionItinerary[i].feeTraveItem;
+		for(let k=0;k<feeTraveItem.length;k++){
+			if(typeof priceList[feeTraveItem[k].id]==='undefined'){
+				priceList[feeTraveItem[k].id]=0;
+			}
+			priceList[feeTraveItem[k].id]+=parseFloat(feeTraveItem[k].price);
+		}
+	}
+	
+	$("input[id^='travel_']").val(0);
+	$("td span").html(0);
+	
+	let travelResult=0;
+	for(let i=0;i<priceList.length;i++){
+		if(typeof priceList[i]==='number'){
+			$("span[travelprice_"+i+"]").html(priceList[i]);
+			$("#travel_"+i+"").val(priceList[i]);
+			travelResult+=priceList[i];
+		}
+	}
+	
+	$("#travelResult").html(travelResult);
+	$("#RS").html(travelResult);
+}
+
+function districtTop(selected){
+	
+	var storage=window.localStorage;
+	
+	if(typeof storage["districtTop"]==='undefined'||storage["districtTop"]===''){
+		$.ajax({
+			url : '/api/district',
+			type : "post",
+			cache : false,
+			dataType : "json",
+			global : true,
+			success : function(data) {
+				storage.setItem("districtTop",JSON.stringify(data.districtList));
+				//districtTop(data.districtList);
+				
+			},
+			error : function(err) {}
+		});
+	}
+	
+	var districtTop=JSON.parse(storage["districtTop"]);
+	
+	var html='';
+	for(let i=0;i<districtTop.length;i++){
+		if(typeof selected!=='undefined'&&selected.departureprovince==districtTop[i].name){
+			html+='<option selected value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
+		}else{
+			html+='<option value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
+		}
+		
+	}
+	$("select[departureProvince]").html(html);
+	
+	html='';
+	for(let i=0;i<districtTop.length;i++){
+		if(typeof selected!=='undefined'&&selected.arrivalsprovince==districtTop[i].name){
+			html+='<option selected value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
+		}else{
+			html+='<option value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
+		}
+		
+	}
+	$("select[arrivalsProvince]").html(html);
+}
+
+function districtCityBuild(selectDom,obj,selected){
+	
+	var storage=window.localStorage;
+	var id=$('select['+obj+']').val();
+	
+	if(typeof storage["district_"+id]==='undefined'||storage["district_"+id]===''){
+		$.ajax({
+			url : '/api/district?did='+id,
+			type : "post",
+			cache : false,
+			dataType : "json",
+			async:false,
+			global : true,
+			success : function(data) {
+				storage.setItem("district_"+id,JSON.stringify(data.districtList));
+				//districtCity(selectDom,data.districtList);
+			},
+			error : function(err) {}
+		});
+	}
+	
+	districtCity=JSON.parse(storage["district_"+id]);
+	
+	var html='';var cityName='';
+	if(typeof selected!=='undefined'){
+		if(selectDom=='departurecity'){
+			cityName=selected.departurecity;
+		}else{
+			cityName=selected.arrivalscity.substring(1);
+		}
+	}
+	
+	
+	for(let i=0;i<districtCity.length;i++){
+		
+		if(typeof selected!=='undefined'&&cityName==districtCity[i].name){
+			html+='<option selected value='+districtCity[i].name+'>'+districtCity[i].name+'</option>';
+		}else{
+			html+='<option value='+districtCity[i].name+'>'+districtCity[i].name+'</option>';
+		}
+	}
+	$("select["+selectDom+"]").html(html);
+}
+
+function buildItinerary(list){
+	var html='';
+	for(let i=0;i<list.length;i++){
+		html+='<tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> '+list[i].departuredate+list[i].arrivalsdate+' '+list[i].departurecity+list[i].arrivalscity+'';
+		html+='<div class="fR"><a href="#route-add" ediStroke data-toggle="modal" dataId="'+i+'" >编辑</a>&nbsp;<a href="#" dataId="'+i+'" removeItinerary class="colRed">移除</a></div></th></tr>';
+		let feeTraveItem=list[i].feeTraveItem;
+		let price=0;
+		for(let k=0;k<feeTraveItem.length;k++){
+			price+=parseFloat(feeTraveItem[k].price);
+			html+='<tr><th>'+feeTraveItem[k].name+'<p class="colGray">#'+feeTraveItem[k].detail+'</p></th><td width="200" class="taR">￥'+feeTraveItem[k].price+'</td></tr>';
+		}
+		html+='<tr><th class="taR">合计</th><td class="colGreen taR">￥'+price+'</td></tr>';
+	}
+	$("tbody[itinerary]").html(html);
+}
+
+function buildFeeTravelItem(feeTraveItem){
+	
+	var html='';
+	for(let i=0;i<feeTraveItem.length;i++){
+		html+='<tr class="remove" ><th>'+feeTraveItem[i].name+'</th>';
+		html+='<td class="taR">￥<input type="number" itemId_'+feeTraveItem[i].id+' data="'+feeTraveItem[i].name+'" dataId="'+feeTraveItem[i].id+'" value="'+feeTraveItem[i].price+'" placeholder="输入费用" pattern="[0-9]" step="1" min="0"class="span2"></td>';
+		html+='<td><input type="text" value="'+feeTraveItem[i].detail+'" itemDetail_'+feeTraveItem[i].id+' placeholder="填写费用说明"></td>';
+		html+='<td><a href="#" removeFeeTravelItem >移除</a></td></tr>';
+	}
+	$("tbody[feeTravelItem]").html(html);
+}
+
+function fnGetItineraryData(){
+	var departurecity=$("select[departurecity] option:selected").text();
+	var arrivalscity=$("select[arrivalscity] option:selected").text();
+	var departureprovince=$("select[departureprovince] option:selected").text();
+	var arrivalsprovince=$("select[arrivalsprovince] option:selected").text();
+	
+	var departuredate=$("input[departuredate]").val();
+	var arrivalsdate=$("input[arrivalsdate]").val();
+	
+	var feeTravePriceList=$("tbody[feeTravelItem]").find('input[type=number]');
+	var feeTraveDetailList=$("tbody[feeTravelItem]").find('input[type=text]');
+	
+	if(arrivalscity!==''){
+		arrivalscity='-'+arrivalscity;
+	}
+	if(arrivalsdate!==''){
+		arrivalsdate='~'+arrivalsdate;
+	}
+	
+	var feeTraveItem=[];
+	for(let i=0;i<feeTravePriceList.length;i++){
+		feeTraveItem.push({'id':$(feeTravePriceList[i]).attr('dataId'),'name':$(feeTravePriceList[i]).attr('data'),'price':$(feeTravePriceList[i]).val(),'detail':$(feeTraveDetailList[i]).val()});
+	}
+	
+	var itinerary={'departuredate':departuredate,'departureprovince':departureprovince,'departurecity':departurecity,'arrivalsdate':arrivalsdate,'arrivalsprovince':arrivalsprovince,'arrivalscity':arrivalscity,'feeTraveItem':feeTraveItem};
+	return itinerary;
+}
+ */
+
+
+ $(function() {
+	 
+	/*  var sessionStorage= window.sessionStorage;
+		var sessionItinerary= sessionStorage.getItem("itineraryListLoan");
+		if(typeof sessionItinerary!=='object'){
+			buildItinerary(JSON.parse(sessionItinerary));
+			fnTotTravelPrice();
+		}
+		
+		$("a[ediStroke]").click(function() {
+			var sessionItinerary= sessionStorage.getItem("itineraryListLoan");
+			sessionItinerary=JSON.parse(sessionItinerary);
+			var id=$(this).attr('dataId');
+			
+			var storage=window.localStorage;
+			
+			districtTop(sessionItinerary[id]);
+			districtCityBuild('departurecity','departureprovince',sessionItinerary[id]);
+			districtCityBuild('arrivalscity','arrivalsprovince',sessionItinerary[id]);
+			
+			$("input[departuredate]").val(sessionItinerary[id].departuredate);
+			$("input[arrivalsdate]").val(sessionItinerary[id].arrivalsdate.substring(1));
+			
+			buildFeeTravelItem(sessionItinerary[id].feeTraveItem);
+			
+			$("a[additinerarybut]").hide();
+			$("a[ediItineraryBut]").show();
+		});
+		
+		$("a[addStroke]").click(function() {
+			districtTop();
+			districtCityBuild('departurecity','departureprovince');
+			districtCityBuild('arrivalscity','arrivalsprovince');
+			$("input[departuredate]").val('');
+			$("input[arrivalsdate]").val('');
+			$("tbody[feeTravelItem]").html('');
+			
+			$("a[additinerarybut]").show();
+			$("a[ediItineraryBut]").hide();
+		});
+		
+		$("select[departureProvince]").change(function() {
+			districtCityBuild('departurecity','departureprovince');
+		});
+		
+		$("select[arrivalsProvince]").change(function() {
+			districtCityBuild('arrivalscity','arrivalsprovince');
+		});
+		
+		$("a[feeTravelItem]").click(function() {
+			var itemName=$("select[feeTravelItem] option:selected").text();
+			var itemId=$("select[feeTravelItem] option:selected").val();
+			
+			var html='<tr class="remove" ><th>'+itemName+'</th>';
+			html+='<td class="taR">￥<input type="number" itemId_'+itemId+' data="'+itemName+'" dataId="'+itemId+'" value="0" placeholder="输入费用" pattern="[0-9]" step="1" min="0"class="span2"></td>';
+			html+='<td><input type="text" itemDetail_'+itemId+' placeholder="填写费用说明"></td>';
+			html+='<td><a href="#" removeFeeTravelItem >移除</a></td></tr>';
+			$("tbody[feeTravelItem]").append(html);
+			
+		});
+		
+		$("tbody[feeTravelItem]").on("click","a[removeFeeTravelItem]",function(){
+			$(this).closest('.remove').remove();
+		});
+		
+		$("tbody[itinerary]").on("click","a[edistroke]",function(){
+			$("input[name=ediStrokeId]").val($(this).attr('dataid'));
+			
+			var sessionItinerary= sessionStorage.getItem("itineraryListLoan");
+			sessionItinerary=JSON.parse(sessionItinerary);
+			var id=$(this).attr('dataId');
+			
+			var storage=window.localStorage;
+			
+			districtTop(sessionItinerary[id]);
+			districtCityBuild('departurecity','departureprovince',sessionItinerary[id]);
+			districtCityBuild('arrivalscity','arrivalsprovince',sessionItinerary[id]);
+			
+			$("input[departuredate]").val(sessionItinerary[id].departuredate);
+			$("input[arrivalsdate]").val(sessionItinerary[id].arrivalsdate.substring(1));
+			
+			buildFeeTravelItem(sessionItinerary[id].feeTraveItem);
+			
+			$("a[additinerarybut]").hide();
+			$("a[ediItineraryBut]").show();
+			
+		});
+		
+		$("a[ediItineraryBut]").click(function() {
+			var itinerary=fnGetItineraryData();
+			var siIndex=$("input[name=ediStrokeId]").val();
+			
+			var sessionItinerary =JSON.parse(sessionStorage.getItem("itineraryListLoan"));
+			
+			sessionItinerary[siIndex]=itinerary;
+			sessionStorage.setItem("itineraryListLoan",JSON.stringify(sessionItinerary));
+			buildItinerary(sessionItinerary);
+			fnTotTravelPrice();
+		});
+		
+		$("a[addItineraryBut]").click(function() {
+			var itinerary=fnGetItineraryData();
+			
+			var sessionItinerary = sessionStorage.getItem("itineraryListLoan");
+			
+			if(typeof sessionItinerary==='object'){
+				sessionItinerary=[];
+				sessionItinerary.push(itinerary);
+				sessionStorage.setItem("itineraryListLoan",JSON.stringify(sessionItinerary));
+			}else{
+				sessionItinerary=JSON.parse(sessionItinerary);
+				sessionItinerary.push(itinerary);
+				sessionStorage.setItem("itineraryListLoan",JSON.stringify(sessionItinerary));
+			}
+			
+			buildItinerary(sessionItinerary);
+			fnTotTravelPrice();
+		});
+		
+		$("tbody[itinerary]").on("click","a[removeItinerary]",function(){
+			
+			var sessionItinerary= sessionStorage.getItem("itineraryListLoan");
+			var id=$(this).attr('dataId');
+			sessionItinerary=JSON.parse(sessionItinerary);
+			sessionItinerary.splice(id,1);
+			sessionStorage.setItem("itineraryListLoan",JSON.stringify(sessionItinerary));
+			buildItinerary(sessionItinerary);
+			$("#itinerary").val(JSON.stringify(sessionItinerary));
+			buildItinerary(sessionItinerary);
+			fnTotTravelPrice();
+		}); */
+	 
+	 
+ //--------------------------------------------
+	 $("input[id^='inttrain_']").change(function() {
+			
+			$i=0;
+			$("input[id^='inttrain_']").each(function(i){
+				$i+=parseFloat(this.value);
+				
+			 });
+			$("#inttrainResult").html("￥"+$i.toFixed(2));
+			$("#inttrainR").val($i.toFixed(2));
+			
+			var agencyR=$("#agencyR").val();
+			var otherR=parseFloat($("#otherR").val());
+			var travelR=parseFloat($("#travelR").val());
+			var RS=parseFloat($i)+parseFloat(agencyR)+travelR+otherR;
+			
+			$("#RS").html("￥"+RS.toFixed(2));
+		});
+	 
+	 $("select[selectReceiptClass]").change(function() {
+		 let receiptClass=$(this).val();
+		 resetPageData();
+		 $('tbody[agency]').hide();
+		 $('tbody[trave]').hide();
+		 $('tbody[internalTrain]').hide();
+		 
+		 let id=$('input[name=rid]').val();
+		 
+		 if(receiptClass==='agency'){
+			 window.location.href="/saeaLoanReceiptAdd/"+id+"?receiptClass=agency"
+		 }else if(receiptClass==='trave'){
+			 $('tbody[trave]').show();
+		 }else if(receiptClass==='internalTrain'){
+			 window.location.href="/saeaLoanReceiptAdd/"+id+"?receiptClass=internalTrain"
+		 }
+		 
+	 });
+	 
+	 
+ })
+ </script>
+ 
+    
+    
+    
+    
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/view/receipt/feeLoanReceiptTraveEdi.html

@@ -0,0 +1,697 @@
+<!-- include '../admin/header' -->
+  <link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css"> 
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
+ <script src="<?= WEB_SITE_GLOBAL ?>js/receipt.js"></script>
+
+ 
+
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<!-- include '../admin/receipt_menu' -->
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+			
+			
+			
+			<div class="borad-news">
+			
+			
+			
+				<legend><div class="fR"></div>编辑报销单</legend>
+				
+				
+				
+				<div class="saeaList ">
+	  			<!-- loop receiptList -->
+	  			<div class="entry loan-list" >
+	  			<!-- 
+	  				<!-- if {{receiptList' value.status}}==1 -->
+	  				<div class="seal done"></div>
+	  				<!-- elseif {{receiptList' value.status}}==3 -->
+	  				<div class="seal undone"></div>	
+	  				<!-- elseif {{receiptList' value.status}}==4 -->
+	  				<div class="seal back"></div>	
+	  				<!-- endif -->
+	  				 -->
+	  				
+	  				
+	  			
+	  			<div class="seTable">
+						<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+							<tr><th colspan="2" class="taC">借款费用</th></tr>
+							
+							<!-- loop receiptList' value.loanItem.借款费用 -->
+	  							<tr><th>{{receiptList' value' value.name}}</th><td  width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+							<tr><th>借款费用</th><td width="140" class="taR">￥{{receiptList' value.accountItem.cSum.loanSum}}</td></tr>
+							
+							<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
+							<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
+							<tr><th class="taC" colspan="2">费用说明</th>
+							</tr><tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+							
+							<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次费用合计</b></td>
+							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.BIGsum}}</td></tr>
+							</tbody>
+						</table>
+					</div>
+	  			
+	  			
+	  			
+	  			
+	  				
+	  				<div class="seCensor loan-censor">
+	  					
+	  				
+	  					<div class="title">
+	  					{{receiptDetail' value.receiptOrder}}
+	  					</div>
+	  					<div class="censorList">
+	  					<ul>
+		  						<li class="post">
+		  							<div class="avtra"><img src="{{staff.0.avatar}}_2.jpg" width="32"></div>
+		  							<div class="comment">
+		  								<p><span class="fR">{{receiptDetail' value.date}}</span>{{staff.0.username}}</p>
+		  								<p>提交审批</p>
+		  							</div>
+		  							
+		  						</li>
+		  						
+		  						
+		  						
+		  						
+		  						<!-- loop receiptDetail' value.verifyList -->
+		  						
+		  						
+		  						
+			  						<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"></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>
+			  								<p>{{receiptDetail' value' value.opinion}}</p>
+			  							</div>
+			  							
+			  						</li>
+		  						
+		  						
+		  						<!-- endloop -->
+		  						
+	  						
+	  					</ul>
+	  					
+	  					</div>
+	  					
+	  					
+	  				</div>
+	  			</div>
+	  			<!-- endloop -->
+	  			
+			</div>
+				
+				
+				
+				
+				
+				
+				
+				
+	  		<div class="saeaList">
+	  			<div class="entry">
+	  				<div class="seTable">
+	  				<input type="hidden" id="agencyR" value="{{cSum.agencySum}}" />
+	  				<input type="hidden" id="travelR" value="{{cSum.travelSum}}" />
+	  				<input type="hidden" id="trainR" value="{{cSum.trainSum}}" />
+	  				<input type="hidden" id="otherR" value="{{cSum.otherSum}}" />
+	  				<form action="/updateReceipt" name="recepitAdd" method="post">
+	  					<input type="hidden" name="rid" value="{{ridKey}}"/>
+	  					
+	  					<input type="hidden" name="receiptClass" value="trave"/>
+	  					<input type="hidden" name="itinerary" id="itinerary" value="" />
+	  					
+	  					<table class="table table-bordered table-condensed table-hover">
+	  					<tbody>
+	  					   
+	  						<tr>
+											<th colspan="2" class="taC">行程详细</th>
+										</tr>
+										<tbody itinerary >
+											
+										</tbody>
+
+										<tr>
+											<th colspan="2" class="taC"><a href="#route-add"
+												class="button" addStroke data-toggle="modal">设置行程费用单</a></th>
+										</tr>
+	  						
+	  						
+	  						
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
+	  						<!-- loop acItem -->
+		  						<!-- if {{acItem' value.category}} =="差旅相关费用" -->
+	  						<tr>
+	  						<th>{{acItem' value.name}}</th>
+	  						<td  width="200" class="taR">￥<span travelPrice_{{acItem' value.aid}} ><!-- if !empty({{acItem' value.price}}) --> {{acItem' value.price}} <!-- else --> 0 <!-- endif --></span>
+	  						<input type="hidden" id="travel_{{acItem' value.aid}}" name="travel[]" <!-- if !empty({{acItem' value.price}}) --> value="{{acItem' value.price}}" <!-- else --> value="0" <!-- endif --> placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2"></td>
+	  						</tr>
+	  							<!-- endif -->
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR" id="travelResult">￥{{cSum.travelSum}}</td></tr>
+
+
+							
+
+
+							
+	  						
+	  						
+	  						
+	  						<tr class="warning"><td class="taR"><b>本次报销费用合计</b></td><td class="colGreed taR"><b style="font-size:24px" id="RS">￥{{sum}}</b></td></tr>
+	  						<tr>
+								<th>选择审批组</th>
+								<td class="taR">
+								<select name="verify">
+								<!-- loop veList -->
+								<option <!-- if {{receiptDetail.verify}}=={{veList' value.vid}} --> selected <!-- endif --> value="{{veList' value.vid}}" >{{veList' value.description}}（
+								{{veList' value.staff}}
+								
+								
+								）</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>
+	  						
+	  						<tr><th colspan="2" class="taC">产生费用所在办事处</th></tr>
+							<tr>
+								<th>选择办事处</th>
+								<td class="taR">
+								<select name="cid" class="span2">
+								<!-- loop category -->
+								<option <!-- if {{receiptDetail.cid}}=={{category' value.cid}} --> selected <!-- endif --> value="{{category' value.cid}}" >{{category' value.title}}</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>	
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
+							<tr><th>收款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入收款人户名" ></td>
+							</tr>
+							
+							<tr>
+							<th>收款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">广发银行</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							
+							<tr><th>收款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入收款开户银行名称" >
+							</td></tr>
+							<tr><th>收款账号</th><td>
+							<input type="text" placeholder="请输入收款账号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
+							</td></tr>
+							<tr node-cn style="display:none" ><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是广发银行，务必填上银行联行号）</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
+							</td></tr>
+	  						
+	  						<tr><th colspan="2" class="taC">报销说明</th></tr>
+	  						<tr><th colspan="2">
+	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="市内交通费、邮寄费、公关费、办公费等费用说明，请详细填写在这。">{{receiptDetail.explanation}}</textarea>
+	  						</th></tr>
+	  						
+	  						
+	  						</tbody>
+	  					</table>
+	  					<table class="table">
+	  						<tr><td><input type="submit" value="生成报销单 >>" class="button" /></td></tr>
+	  					</table>
+	  				</form>	
+	  				</div>
+	  				<div class="seCensor">
+	  					<div class="title">
+	  					报销单填写说明
+	  					</div>
+	  					
+	  					<div class="itinerary">
+			  						<h2 class="itineraryTitle">总行程单</h2>
+			  						<div class="itineraryCon" >
+			  							<ul itineraryinfo>
+			  								
+			  							</ul>
+			  						</div>
+			  					</div>
+	  					
+	  					
+	  				</div>
+	  			</div>
+			</div>
+		</div>
+	
+	
+	
+	</div>
+	
+	</div>
+	<!--弹出 添加行程 -->
+		<div class="modal hide fade" id="route-add">
+			<div class="modal-dialog">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h3>设置行程费用单</h3>
+					</div>
+					<div class="modal-body saeaList">
+						<input type="hidden" name="ediStrokeId" >
+						<table class="table table-bordered table-condensed">
+							<tr>
+								<th class="taC" colspan="4">出发-到达</th>
+							</tr>
+							<tr>
+								<th>出发地</th>
+								<td>
+								<select departureProvince >
+								
+								</select>
+								<select departureCity>
+								
+								</select>
+								</td>
+								<th>到达地</th>
+								<td>
+								<select arrivalsProvince ></select>
+								<select arrivalsCity></select>
+								</td>
+							</tr>
+							<tr>
+								<th>出发日期</th>
+								<td><input type="date" departureDate ></td>
+								<th>到达日期</th>
+								<td><input type="date" arrivalsDate ></td>
+							</tr>
+							<tr>
+								<td colspan="4" class="colGray">如果是停留，出发地和到达地填写住宿地。（如：广东省珠海市-广东省珠海市）</td>
+							</tr>
+						</table>
+						<select feeTravelItem >
+						
+						<!-- loop acItem -->
+										<!-- if {{acItem' value.category}} =="差旅相关费用" -->
+										<option value='{{acItem' value.aid}}'>{{acItem' value.name}}</option>
+										
+										<!-- endif -->
+						<!-- endloop -->
+						
+						
+							</select><a href="#" feeTravelItem class="button">添加费用</a>
+						<table class="table table-bordered table-condensed">
+							<tr>
+								<th colspan="4" class="taC">费用详情</th>
+							</tr>
+							<tbody feeTravelItem >
+							</tbody>
+							
+						</table>
+					</div>
+					<div class="modal-footer">
+						<a href="#" addItineraryBut class="button" data-dismiss="modal" aria-hidden="true">确认</a>
+						<a href="#" ediItineraryBut style="display:none" class="button" data-dismiss="modal" aria-hidden="true">确认</a>
+						<a href="#" class="button btn-gray" data-dismiss="modal"
+							aria-hidden="true">关闭</a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!--结束 弹出 添加行程 -->
+
+
+<script type="text/javascript">
+			
+			var sessionStorageList='itineraryListLoanEdi';
+			sessionStorage.setItem("itineraryListLoanEdi",'{{receiptDetail.itinerary}}');
+		</script>
+ <script src="<?= itinerary ?>"></script>
+
+
+
+<script >
+
+
+/* function fnTotTravelPrice(){
+	var itineraryStr=sessionStorage.getItem("itineraryListLoanEdi");
+	var sessionItinerary= JSON.parse(itineraryStr);
+	$("#itinerary").val(itineraryStr);
+	var priceList=[];
+	for(let i=0;i<sessionItinerary.length;i++){
+		let feeTraveItem=sessionItinerary[i].feeTraveItem;
+		for(let k=0;k<feeTraveItem.length;k++){
+			if(typeof priceList[feeTraveItem[k].id]==='undefined'){
+				priceList[feeTraveItem[k].id]=0;
+			}
+			priceList[feeTraveItem[k].id]+=parseFloat(feeTraveItem[k].price);
+		}
+	}
+	
+	$("input[id^='travel_']").val(0);
+	$("td span").html(0);
+	
+	let travelResult=0;
+	for(let i=0;i<priceList.length;i++){
+		if(typeof priceList[i]==='number'){
+			$("span[travelprice_"+i+"]").html(priceList[i]);
+			$("#travel_"+i+"").val(priceList[i]);
+			travelResult+=priceList[i];
+		}
+	}
+
+	$("#travelResult").html(travelResult);
+	$("#RS").html(travelResult);
+}
+
+function districtTop(selected){
+	
+	var storage=window.localStorage;
+	
+	if(typeof storage["districtTop"]==='undefined'||storage["districtTop"]===''){
+		$.ajax({
+			url : '/api/district',
+			type : "post",
+			cache : false,
+			dataType : "json",
+			global : true,
+			success : function(data) {
+				storage.setItem("districtTop",JSON.stringify(data.districtList));
+				//districtTop(data.districtList);
+				
+			},
+			error : function(err) {}
+		});
+	}
+	
+	var districtTop=JSON.parse(storage["districtTop"]);
+	
+	var html='';
+	for(let i=0;i<districtTop.length;i++){
+		if(typeof selected!=='undefined'&&selected.departureprovince==districtTop[i].name){
+			html+='<option selected value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
+		}else{
+			html+='<option value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
+		}
+		
+	}
+	$("select[departureProvince]").html(html);
+	
+	html='';
+	for(let i=0;i<districtTop.length;i++){
+		if(typeof selected!=='undefined'&&selected.arrivalsprovince==districtTop[i].name){
+			html+='<option selected value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
+		}else{
+			html+='<option value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
+		}
+		
+	}
+	$("select[arrivalsProvince]").html(html);
+}
+
+function districtCityBuild(selectDom,obj,selected){
+	
+	var storage=window.localStorage;
+	var id=$('select['+obj+']').val();
+	
+	if(typeof storage["district_"+id]==='undefined'||storage["district_"+id]===''){
+		$.ajax({
+			url : '/api/district?did='+id,
+			type : "post",
+			cache : false,
+			dataType : "json",
+			async:false,
+			global : true,
+			success : function(data) {
+				storage.setItem("district_"+id,JSON.stringify(data.districtList));
+				//districtCity(selectDom,data.districtList);
+			},
+			error : function(err) {}
+		});
+	}
+	
+	districtCity=JSON.parse(storage["district_"+id]);
+	
+	var html='';var cityName='';
+	if(typeof selected!=='undefined'){
+		if(selectDom=='departurecity'){
+			cityName=selected.departurecity;
+		}else{
+			cityName=selected.arrivalscity.substring(1);
+		}
+	}
+	
+	
+	for(let i=0;i<districtCity.length;i++){
+		
+		if(typeof selected!=='undefined'&&cityName==districtCity[i].name){
+			html+='<option selected value='+districtCity[i].name+'>'+districtCity[i].name+'</option>';
+		}else{
+			html+='<option value='+districtCity[i].name+'>'+districtCity[i].name+'</option>';
+		}
+	}
+	$("select["+selectDom+"]").html(html);
+}
+
+function buildItinerary(list){
+	var html='';
+	for(let i=0;i<list.length;i++){
+		html+='<tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> '+list[i].departuredate+list[i].arrivalsdate+' '+list[i].departurecity+list[i].arrivalscity+'';
+		html+='<div class="fR"><a href="#route-add" ediStroke data-toggle="modal" dataId="'+i+'" >编辑</a>&nbsp;<a href="#" dataId="'+i+'" removeItinerary class="colRed">移除</a></div></th></tr>';
+		let feeTraveItem=list[i].feeTraveItem;
+		let price=0;
+		for(let k=0;k<feeTraveItem.length;k++){
+			price+=parseFloat(feeTraveItem[k].price);
+			html+='<tr><th>'+feeTraveItem[k].name+'<p class="colGray">#'+feeTraveItem[k].detail+'</p></th><td width="200" class="taR">￥'+feeTraveItem[k].price+'</td></tr>';
+		}
+		html+='<tr><th class="taR">合计</th><td class="colGreen taR">￥'+price+'</td></tr>';
+	}
+	$("tbody[itinerary]").html(html);
+}
+
+function buildFeeTravelItem(feeTraveItem){
+	
+	var html='';
+	for(let i=0;i<feeTraveItem.length;i++){
+		html+='<tr class="remove" ><th>'+feeTraveItem[i].name+'</th>';
+		html+='<td class="taR">￥<input type="number" itemId_'+feeTraveItem[i].id+' data="'+feeTraveItem[i].name+'" dataId="'+feeTraveItem[i].id+'" value="'+feeTraveItem[i].price+'" placeholder="输入费用" pattern="[0-9]" step="1" min="0"class="span2"></td>';
+		html+='<td><input type="text" value="'+feeTraveItem[i].detail+'" itemDetail_'+feeTraveItem[i].id+' placeholder="填写费用说明"></td>';
+		html+='<td><a href="#" removeFeeTravelItem >移除</a></td></tr>';
+	}
+	$("tbody[feeTravelItem]").html(html);
+}
+
+function fnGetItineraryData(){
+	var departurecity=$("select[departurecity] option:selected").text();
+	var arrivalscity=$("select[arrivalscity] option:selected").text();
+	var departureprovince=$("select[departureprovince] option:selected").text();
+	var arrivalsprovince=$("select[arrivalsprovince] option:selected").text();
+	
+	var departuredate=$("input[departuredate]").val();
+	var arrivalsdate=$("input[arrivalsdate]").val();
+	
+	var feeTravePriceList=$("tbody[feeTravelItem]").find('input[type=number]');
+	var feeTraveDetailList=$("tbody[feeTravelItem]").find('input[type=text]');
+	
+	if(arrivalscity!==''){
+		arrivalscity='-'+arrivalscity;
+	}
+	if(arrivalsdate!==''){
+		arrivalsdate='~'+arrivalsdate;
+	}
+	
+	var feeTraveItem=[];
+	for(let i=0;i<feeTravePriceList.length;i++){
+		feeTraveItem.push({'id':$(feeTravePriceList[i]).attr('dataId'),'name':$(feeTravePriceList[i]).attr('data'),'price':$(feeTravePriceList[i]).val(),'detail':$(feeTraveDetailList[i]).val()});
+	}
+	
+	var itinerary={'departuredate':departuredate,'departureprovince':departureprovince,'departurecity':departurecity,'arrivalsdate':arrivalsdate,'arrivalsprovince':arrivalsprovince,'arrivalscity':arrivalscity,'feeTraveItem':feeTraveItem};
+	return itinerary;
+} */
+
+
+
+	 $(function() {
+		 /* var sessionStorage= window.sessionStorage;
+			sessionStorage.setItem("itineraryListLoanEdi",'{{receiptDetail.itinerary}}');
+			var sessionItinerary= sessionStorage.getItem("itineraryListLoanEdi");
+			if(typeof sessionItinerary!=='object'){
+				buildItinerary(JSON.parse(sessionItinerary));
+				fnTotTravelPrice();
+			}
+			
+			$("a[ediStroke]").click(function() {
+				var sessionItinerary= sessionStorage.getItem("itineraryListLoanEdi");
+				sessionItinerary=JSON.parse(sessionItinerary);
+				var id=$(this).attr('dataId');
+				
+				var storage=window.localStorage;
+				
+				districtTop(sessionItinerary[id]);
+				districtCityBuild('departurecity','departureprovince',sessionItinerary[id]);
+				districtCityBuild('arrivalscity','arrivalsprovince',sessionItinerary[id]);
+				
+				$("input[departuredate]").val(sessionItinerary[id].departuredate);
+				$("input[arrivalsdate]").val(sessionItinerary[id].arrivalsdate.substring(1));
+				
+				buildFeeTravelItem(sessionItinerary[id].feeTraveItem);
+				
+				$("a[additinerarybut]").hide();
+				$("a[ediItineraryBut]").show();
+			});
+			
+			$("a[addStroke]").click(function() {
+				districtTop();
+				districtCityBuild('departurecity','departureprovince');
+				districtCityBuild('arrivalscity','arrivalsprovince');
+				$("input[departuredate]").val('');
+				$("input[arrivalsdate]").val('');
+				$("tbody[feeTravelItem]").html('');
+				
+				$("a[additinerarybut]").show();
+				$("a[ediItineraryBut]").hide();
+			});
+			
+			$("select[departureProvince]").change(function() {
+				districtCityBuild('departurecity','departureprovince');
+			});
+			
+			$("select[arrivalsProvince]").change(function() {
+				districtCityBuild('arrivalscity','arrivalsprovince');
+			});
+			
+			$("a[feeTravelItem]").click(function() {
+				var itemName=$("select[feeTravelItem] option:selected").text();
+				var itemId=$("select[feeTravelItem] option:selected").val();
+				
+				var html='<tr class="remove" ><th>'+itemName+'</th>';
+				html+='<td class="taR">￥<input type="number" itemId_'+itemId+' data="'+itemName+'" dataId="'+itemId+'" value="0" placeholder="输入费用" pattern="[0-9]" step="1" min="0"class="span2"></td>';
+				html+='<td><input type="text" itemDetail_'+itemId+' placeholder="填写费用说明"></td>';
+				html+='<td><a href="#" removeFeeTravelItem >移除</a></td></tr>';
+				$("tbody[feeTravelItem]").append(html);
+				
+			});
+			
+			$("tbody[feeTravelItem]").on("click","a[removeFeeTravelItem]",function(){
+				$(this).closest('.remove').remove();
+			});
+			
+			$("tbody[itinerary]").on("click","a[edistroke]",function(){
+				$("input[name=ediStrokeId]").val($(this).attr('dataid'));
+				
+				var sessionItinerary= sessionStorage.getItem("itineraryListLoanEdi");
+				sessionItinerary=JSON.parse(sessionItinerary);
+				var id=$(this).attr('dataId');
+				
+				var storage=window.localStorage;
+				
+				districtTop(sessionItinerary[id]);
+				districtCityBuild('departurecity','departureprovince',sessionItinerary[id]);
+				districtCityBuild('arrivalscity','arrivalsprovince',sessionItinerary[id]);
+				
+				$("input[departuredate]").val(sessionItinerary[id].departuredate);
+				$("input[arrivalsdate]").val(sessionItinerary[id].arrivalsdate.substring(1));
+				
+				buildFeeTravelItem(sessionItinerary[id].feeTraveItem);
+				
+				$("a[additinerarybut]").hide();
+				$("a[ediItineraryBut]").show();
+				
+			});
+			
+			$("a[ediItineraryBut]").click(function() {
+				var itinerary=fnGetItineraryData();
+				var siIndex=$("input[name=ediStrokeId]").val();
+				
+				var sessionItinerary =JSON.parse(sessionStorage.getItem("itineraryListLoanEdi"));
+				
+				sessionItinerary[siIndex]=itinerary;
+				sessionStorage.setItem("itineraryListLoanEdi",JSON.stringify(sessionItinerary));
+				buildItinerary(sessionItinerary);
+				fnTotTravelPrice();
+			});
+			
+			$("a[addItineraryBut]").click(function() {
+				var itinerary=fnGetItineraryData();
+				
+				var sessionItinerary = sessionStorage.getItem("itineraryListLoanEdi");
+				
+				if(typeof sessionItinerary==='object'){
+					sessionItinerary=[];
+					sessionItinerary.push(itinerary);
+					sessionStorage.setItem("itineraryListLoanEdi",JSON.stringify(sessionItinerary));
+				}else{
+					sessionItinerary=JSON.parse(sessionItinerary);
+					sessionItinerary.push(itinerary);
+					sessionStorage.setItem("itineraryListLoanEdi",JSON.stringify(sessionItinerary));
+				}
+				
+				buildItinerary(sessionItinerary);
+				fnTotTravelPrice();
+			});
+			
+			$("tbody[itinerary]").on("click","a[removeItinerary]",function(){
+				
+				var sessionItinerary= sessionStorage.getItem("itineraryListLoanEdi");
+				var id=$(this).attr('dataId');
+				sessionItinerary=JSON.parse(sessionItinerary);
+				sessionItinerary.splice(id,1);
+				sessionStorage.setItem("itineraryListLoanEdi",JSON.stringify(sessionItinerary));
+				buildItinerary(sessionItinerary);
+				$("#itinerary").val(JSON.stringify(sessionItinerary));
+				buildItinerary(sessionItinerary);
+				fnTotTravelPrice();
+			}); */
+		 
+		 //-----------------------
+		 $("input[id^='inttrain_']").change(function() {
+
+			 $i=0;
+			 $("input[id^='inttrain_']").each(function(i){
+				 $i+=parseFloat(this.value);
+
+			 });
+			 $("#inttrainResult").html("￥"+$i.toFixed(2));
+			 $("#inttrainR").val($i.toFixed(2));
+
+			 var agencyR=$("#agencyR").val();
+			 var otherR=parseFloat($("#otherR").val());
+			 var travelR=parseFloat($("#travelR").val());
+			 var RS=parseFloat($i)+parseFloat(agencyR)+travelR+otherR;
+
+			 $("#RS").html("￥"+RS.toFixed(2));
+		 });
+
+	 })
+ </script>
+
+
+    <!--弹出内容-->
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/view/receipt/feeTraveApproval.html

@@ -0,0 +1,446 @@
+<!-- include '../admin/header' -->
+<link rel=stylesheet
+	href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css">
+<script type="text/javascript"
+	src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
+<script src="<?= receipt ?>"></script>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<!-- include '../admin/receipt_menu' -->
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+				<div class="borad-news">
+				<legend><div class="fR"></div>
+				费用审批
+				</legend>
+
+				<div class="demandCate">
+				<input type="hidden" name="status" value="{{receiptList.0.status}}"></input>
+					<ul class="cateList">
+						<li><a href="/approvalExpenses/pendApproval">返回</a></li>
+						<li><a id="examine" data="{{rid}}" href="javascript:void(0)">查看下一份费用审批</a></li>
+	  			</ul>
+	  		</div>
+	  		
+	  		
+	  		<div class="saeaList">
+	  		
+	  			<!-- loop receiptList -->
+	  			<div id="{{receiptList' value.Locate}}"  class="entry <!-- if {{receiptList' value.Rtype}}==1 -->  loan-list <!-- elseif  {{receiptList' value.Rtype}}==0 --> receipt-list <!-- endif -->">
+	  			
+	  			
+	  			
+	  			<div class="seTable reportTable">
+	  			
+	  				<!-- if {{receiptList' value.Rtype}}==1 -->
+	  				<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+							<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次费用合计</b></td>
+							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+							</tr>
+							
+							<tr><th class="taC" colspan="2">费用说明</th>
+							</tr><tr><td colspan="2">{{explanation}}</td></tr>
+							
+							<tr><th colspan="2" class="taC">借款费用</th></tr>
+							
+							<!-- loop receiptList' value.loanItem.借款费用 -->
+	  							<tr><th>{{receiptList' value' value.name}}</th><td  width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+							
+							<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
+							<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
+							
+							
+							
+							
+							<tr class="warning" style="display:none"><td class="taR"><b>确认汇款金额</b></td>
+							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+							</tr>
+							
+							
+							<td class="taR"><b>本次借款</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+	  						</tr>
+	  						
+	  						<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"><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>
+	  					
+							
+							</tbody>
+						</table>
+				
+	  			<br/>
+	  				
+	  				<!-- endif -->
+	  				
+	  				
+	  				
+	  					
+	  					<table class="table table-bordered table-condensed table-hover">
+	  					<tbody>
+	  						
+	  						<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b></td></tr>
+	  						
+	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
+	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  						
+	  						
+	  						
+	  						<tr>
+											<th colspan="2" class="taC">行程详细</th>
+										</tr>
+										<tbody itinerary >
+											
+										</tbody>
+	  						
+	  						
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">总行程单</th></tr>
+	  						<tr><td colspan="2"><div class="itinerary">
+			  						<div class="itineraryCon">
+			  							<ul itineraryinfo >
+			  								
+			  							</ul>
+			  						</div></div></td></tr>
+	  						
+	  						
+	  						
+	  						
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
+	  						<!-- loop receiptList' value.accountItem.差旅相关费用 -->
+	  						<tr><th>{{receiptDetail' value' value.name}}<div class="repMark fR"><i class="rmDone">●</i><i class="rmUdone">●</i><i class="rmClear">●</i></div></th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.travelSum}}</td></tr>
+	  						
+	  						<!-- if {{status}}==2 -->
+	  						<tr><th colspan="2" class="taC">报销金额调整</th></tr>
+	  						<tr class="error"><td colspan="2" class="taR">
+	  						<form class="taR" style="margin:0" action="/revisePrice" method="post"  name="revisePrice_{{receiptList' value.rid}}">
+	  						<input type="text" name="description" placeholder="输入金额调整描述" class="span4"> ￥<span data-placement="top" data-toggle="ctooltip" data-original-title="扣款请在金额前加“-”">
+	  						<input type="number" name="price" placeholder="输入调整金额" pattern="[0-9]" step="0.01" class="span2"></span>
+	  						<input type="hidden" name="rid" value="{{receiptList' value.rid}}">
+	  						<input type="submit" value="添加" class="btn">
+	  						</form>
+	  						</td>
+	  						</tr>
+	  						<!-- elseif -->
+	  						<tr><th colspan="2" class="taC">报销金额调整</th></tr>
+	  						<!-- loop receiptList' value.reviseDetail -->
+	  						<tr><th><a href="/revocationAdjustment/{{receiptList' value' value.sidKey}}/{{receiptList' value' value.price}}/{{receiptList' value.ridKey}}/{{receiptList' value' value.reviseKey}}">撤销</a><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colOrange taR">￥{{receiptList' value.revisePrice}}</td></tr>
+	  						<!-- endif -->
+	  						
+	  						
+	  						
+	  						
+	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
+	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
+	  						
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
+							<tr><th>收款人户名</th>
+							<td>{{receiptDetail' value.remittanceName}}</td>
+							</tr>
+							<tr>
+							<th>收款银行</th>
+							<td>
+							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
+							广发银行
+							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
+							其他
+							<!-- endif -->
+							</td>
+							</tr>
+							<tr><th>收款开户银行名称</th><td>
+							{{receiptDetail' value.bankName}}
+							</td></tr>
+							<tr><th>收款账号</th><td>
+							{{receiptDetail' value.bankNumber}}
+							</td></tr>
+							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
+							<tr><th>联行号</th><td>
+							{{receiptDetail' value.coupletNumber}}
+							</td></tr>
+							<!-- endif -->
+	  						
+	  						
+	  						
+	  						
+	  						
+	  						<tr><th class="taC" colspan="2">附件</th>
+	  						</tr>
+	  						<tr><td colspan="2">
+	  						
+	  						{{enclosurHtml}}
+	  						
+	  						</td></tr>
+	  						
+	  						
+	  						
+
+						</tbody>
+	  					</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">
+				<!-- 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.relustABS}}
+				<!-- else -->
+				{{receiptDetail' value.sum}}
+				<!-- endif -->
+				</td></tr>
+				</tbody>
+			</table>
+		
+	  				
+	  				</div>
+	  				
+	  				<div class="seCensor <!-- if {{receiptList' value.Rtype}}==1 --> loan-censor <!-- else --> receipt-censor <!-- endif -->">
+	  					<form action="/updateApprovalReceipt" method="post" id="verifyOpinion_{{receiptList' value.rid}}" name="verifyOpinion_{{receiptList' value.rid}}">
+	  						<input type="hidden" id="status_{{receiptList' value.rid}}" name="status" value=""></input>
+	  						<input type="hidden" name="rid" value="{{receiptList' value.rid}}"></input>
+	  						<input type="hidden" name="Locate" value="{{receiptList' value.Locate}}"></input>
+	  						<input type="hidden" name="amount" value="{{receiptList' value.amount}}">
+		  					<div class="title">
+		  					{{receiptDetail' value.receiptOrder}}
+		  					</div>		  					
+		  					<div class="reportButton clearfix" style="display:" >
+		  					
+		  						<!-- if {{receiptDetail' value.button}}==4 -->
+		  						<a href="javascript:void(0)" onClick="updateApprovalReceipt(1,{{receiptList' value.rid}})" class="buttonDone buttonBlock">同意支付</a>
+		  						
+	  						
+		  						<!-- endif -->
+		  					</div>
+		  					<div class="censorList clearfix censorHeight">
+		  					<ul>
+		  					
+		  					<!-- if {{receiptList' value.Rtype}}==1 -->
+		  					<li class="post" >
+		  							<div class="avtra"><img src="{{receiptList' value.staffDetail.avatar}}_2.jpg" width="32"></div>
+		  							<div class="comment">
+		  								<p><span class="fR">{{loanReceiptDate}}</span>{{receiptList' value.staffDetail.username}}</p>
+		  								<p>提交审批</p>
+		  							</div>
+		  						</li>
+		  					
+		  					{{htmlLoan}}
+		  					
+		  					<!-- endif -->
+		  					
+		  					
+		  						<!-- if {{empty(receiptDetail' value.rlList)}} -->
+		  						<li class="post" >
+		  							<div class="avtra"><img src="{{receiptList' value.staffDetail.avatar}}_2.jpg" width="32"></div>
+		  							<div class="comment">
+		  								<p><span class="fR">
+		  								<!-- if {{receiptList' value.Rtype}}==1 -->
+		  								{{receiptList' value.date}}
+		  								
+		  								<!-- else -->
+		  								{{tijdate}}
+		  								<!-- endif -->
+		  								</span>{{receiptList' value.staffDetail.username}}</p>
+		  								<p>提交审批</p>
+		  							</div>
+		  						</li>
+		  						<!-- endif -->
+		  					
+		  						<!-- loop receiptDetail' value.rlList -->
+		  						<li  <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==4 --> class="back" <!-- elseif {{receiptDetail' value' value.status}}==2 --> class="post" <!-- endif --> >
+		  							<div class="avtra"><img src="{{receiptDetail' value' value.img}}_2.jpg" width="32"></div>
+		  							<div class="comment">
+		  								<p <!-- if {{receiptDetail' value' value.status}}!=2 --> class="colGray" <!-- endif --> ><span class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.username}} <!-- if {{receiptDetail' value' value.rolename}}!='' --> （{{receiptDetail' value' value.rolename}}） <!-- endif --></p>
+		  								<p>{{receiptDetail' value' value.opinion}}</p>
+		  							</div>
+		  						</li>
+		  						<!-- endloop -->
+		  						
+		  						<!-- loop receiptDetail' value.verifyList -->
+		  						
+		  						
+		  						<!-- if  {{receiptDetail' value' value.status}}!=1||{{empty(receiptDetail' value.rlList)}} -->
+			  						<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>
+			  							<!-- if {{receiptDetail' value' value.status}}==4 -->
+			  							<div class="comment">
+			  								{{receiptDetail' value' value.1}}<!-- if isset({{receiptDetail' value' value.rolename}}) --> （{{receiptDetail' value' value.rolename}}） <!-- endif -->
+			  								<p><textarea name="opinion" id="opinion_{{receiptList' value.rid}}" placeholder="填写审批意见（可选）"></textarea></p>
+			  							</div>
+			  							<!-- else -->
+			  							<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>
+			  								<p>{{receiptDetail' value' value.opinion}}</p>
+			  							</div>
+			  							<!-- endif -->
+			  						</li>
+		  						<!-- endif -->
+		  						
+		  						<!-- endloop -->
+		  						
+		  					</ul>
+		  					</div>
+					<div class="reportButton clearfix" style="display:" >
+		  					
+		  						<!-- if {{receiptDetail' value.button}}==4 -->
+		  						
+		  						<a href="javascript:void(0)" p-d="{{receiptList' value.rid}}" node-ReceiptBack="true" class="buttonBack <!-- if {{receiptList' value.Rtype}}==1 --> buttonBlock  <!-- endif -->" data-placement="top" data-toggle="ctooltip" data-original-title="上报人修改后由你继续审批">撤回</a>
+	  							<!-- if {{receiptList' value.Rtype}}!=1 -->
+	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(3,{{receiptList' value.rid}})" class="buttonUndone" data-placement="top" data-toggle="ctooltip" data-original-title="终止报销单">终止</a>
+	  							<!-- endif -->
+	  						
+		  						<!-- endif -->
+		  					</div>
+	  					</form>
+	  					
+	  					
+	  				</div>
+	  				
+	  			</div>
+	  		<!-- endloop -->
+	  		</div>
+	  		
+	  		</div>
+	  		
+			</div>
+		</div>
+	</div>
+	<script type="text/javascript">
+	function buildItinerary(feeTraveItem){
+				var html='';
+				
+				
+				for(let k=0;k<feeTraveItem.length;k++){
+					html+=`<p class="routeW">
+					<b class="fR">￥${feeTraveItem[k].price}</b>
+					<b>${feeTraveItem[k].name}</b>
+					</p><p class="colGray">#${feeTraveItem[k].detail}</p>
+				<p></p>`;
+				}
+				return html;
+				
+			}
+	//构建总行程单
+	function buildItineraryProcess(data){
+		let html='';
+		let dataJson=data;
+		if(typeof data==='string'){
+			dataJson=JSON.parse(data);
+		}
+		
+		let last=dataJson.length-1;
+		
+		
+		for(let i=0;i<dataJson.length;i++){
+			let price=0;
+			for(let p=0;p<dataJson[i].feeTraveItem.length;p++){
+				price+=parseFloat(dataJson[i].feeTraveItem[p].price);
+			}
+			
+			let feeTraveItem=dataJson[i].feeTraveItem;
+			let itemHtml=buildItinerary(feeTraveItem);
+			
+			
+			html+=`<li>
+				<div class="itineraryList">
+					<div class="addressName"><i class="contactsMark icon-">P</i> <b>${dataJson[i].departurecity}</b></div>
+					<div class="pointLine">
+						<div class="priceList">
+							<span class="priceTitle">金额</span>
+							<span class="price colGreen">￥${price}</span>
+						</div>
+						<div class="timeList">
+							<span class="timeTitle">时间</span>
+							<span class="time">${dataJson[i].departuredate}${dataJson[i].arrivalsdate}</span>
+						</div>
+						<div class="routeList clearfix">
+							<span class="routeTitle fL">详情</span>
+							<span class="route fL">
+							
+								${itemHtml}
+							</span>
+						</div>
+					</div>
+				</div>
+			</li>`;
+			
+			if(i===last){
+				let arrivalscity=dataJson[i].arrivalscity.substring(1);
+				
+				html+=`<li>
+				<div class="itineraryList">
+					<div class="addressName"><i class="contactsMark icon-">P</i> <b>${arrivalscity}</b></div>
+					
+				</div>
+			</li>`;
+				
+			}
+		}
+		
+		$("ul[itineraryinfo]").html(html);
+	}
+	$(function() {
+				
+				var sessionStorage= window.sessionStorage;
+				sessionStorage.setItem("itineraryListApproval",'{{receiptList.0.itinerary}}');
+				var sessionItinerary= sessionStorage.getItem("itineraryListApproval");
+				if(typeof sessionItinerary!=='object'){
+					buildItinerary(JSON.parse(sessionItinerary));
+					buildItineraryProcess(sessionItinerary);
+				}
+	})
+	</script>	
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/view/receipt/feeTravel.html

@@ -7,6 +7,7 @@
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
 <script src="<?= receipt ?>"></script>
 
+
 <body>
 	<div class="mainLayout">
 		<div class="mainMenu">
@@ -34,7 +35,7 @@
 							<div class="seTable">
 								<input type="hidden" id="agencyR" value="0" /> <input
 									type="hidden" id="otherR" value="0" />
-								<form action="/addReceipt" name="recepitAdd" method="post">
+								<form action="/addFeeTravel" name="recepitAdd" method="post">
 
 									<input type="hidden" name="iid" id="iid" value="" />
 <input type="hidden" name="itinerary" id="itinerary" value="" />
@@ -50,6 +51,56 @@
 											
 										</tbody>
 
+										<tr>
+											<td colspan="2">
+											<div class="itinerary">
+													<div class="itineraryCon">
+														<ul itineraryinfo>
+															<li>
+																<div class="itineraryList">
+																	<div class="fR">
+																		<a href="">编辑</a>
+																	</div>
+																	<div class="addressName">
+																		<i class="contactsMark icon-">P</i> <b>珠海</b>
+																	</div>
+																	<div class="timeList">
+																		<span class="timeTitle"><i
+																			class="contactsMark icon-">Q</i></span> <span class="time">2020-05-12</span>
+																	</div>
+																	<div class="pointLine">
+																		<div class="priceList">
+																			<span class="priceTitle">费用</span> <span
+																				class="price colGreen">￥100</span>
+																		</div>
+
+																		<div class="routeList clearfix">
+																			<span class="routeTitle fL">详情</span> <span
+																				class="route fL">
+																				<p class="routeW">
+																					<b class="fR">￥75.00</b> <b>往来交通费</b>
+																				</p>
+																				<p class="colGray">#高铁</p>
+																				<p></p>
+																				<p class="routeW">
+																					<b class="fR">￥25.00</b> <b>市内交通费</b>
+																				</p>
+																				<p class="colGray">#出租车</p>
+																				<p></p>
+																			</span>
+																		</div>
+																	</div>
+																</div>
+															</li>
+															
+														</ul>
+													</div>
+												</div>
+												</td>
+										</tr>
+
+
+
 
 										<tr>
 											<th colspan="2" class="taC"><a href="#route-add"
@@ -57,6 +108,7 @@
 										</tr>
 
 
+
 										<tr>
 											<th colspan="2" class="taC">差旅相关费用</th>
 										</tr>
@@ -218,6 +270,16 @@
 										3 邮寄费、公关费、办公费等详细说明请填写到 <b>报销说明</b>。
 									</p>
 								</div>
+								
+								<!-- <div class="itinerary">
+			  						<h2 class="itineraryTitle">总行程单</h2>
+			  						<div class="itineraryCon" >
+			  							<ul itineraryinfo>
+			  								
+			  							</ul>
+			  						</div>
+			  					</div> -->
+								
 							</div>
 						</div>
 					</div>
@@ -301,289 +363,37 @@
 
 		<script type="text/javascript">
 			autoFlashHeight();
+			var sessionStorageList='itineraryList';
 		</script>
-		<script>
-		
-			function fnTotTravelPrice(){
-				var itineraryStr=sessionStorage.getItem("itineraryList");
-				var sessionItinerary= JSON.parse(itineraryStr);
-				$("#itinerary").val(itineraryStr);
-				var priceList=[];
-				for(let i=0;i<sessionItinerary.length;i++){
-					let feeTraveItem=sessionItinerary[i].feeTraveItem;
-					for(let k=0;k<feeTraveItem.length;k++){
-						if(typeof priceList[feeTraveItem[k].id]==='undefined'){
-							priceList[feeTraveItem[k].id]=0;
-						}
-						priceList[feeTraveItem[k].id]+=parseFloat(feeTraveItem[k].price);
-					}
-				}
-				
-				
-				
-				for(let i=0;i<priceList.length;i++){
-					if(typeof priceList[i]==='number'){
-						$("span[travelprice_"+i+"]").html(priceList[i]);
-						$("#travel_"+i+"").val(priceList[i]);
-					}
-				}
-			}
 		
-			function districtTop(selected){
-				
-				var storage=window.localStorage;
-				
-				if(typeof storage["districtTop"]==='undefined'||storage["districtTop"]===''){
-					$.ajax({
-						url : '/api/district',
-						type : "post",
-						cache : false,
-						dataType : "json",
-						global : true,
-						success : function(data) {
-							storage.setItem("districtTop",JSON.stringify(data.districtList));
-							//districtTop(data.districtList);
-							
-						},
-						error : function(err) {}
-					});
-				}
-				
-				var districtTop=JSON.parse(storage["districtTop"]);
-				
-				var html='';
-				for(let i=0;i<districtTop.length;i++){
-					if(typeof selected!=='undefined'&&selected.departureprovince==districtTop[i].name){
-						html+='<option selected value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
-					}else{
-						html+='<option value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
-					}
-					
-				}
-				$("select[departureProvince]").html(html);
-				
-				html='';
-				for(let i=0;i<districtTop.length;i++){
-					if(typeof selected!=='undefined'&&selected.arrivalsprovince==districtTop[i].name){
-						html+='<option selected value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
-					}else{
-						html+='<option value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
-					}
-					
-				}
-				$("select[arrivalsProvince]").html(html);
-			}
+		<script src="<?= itinerary ?>"></script>
+		<script>
 		
-			function districtCityBuild(selectDom,obj,selected){
-				
-				var storage=window.localStorage;
-				var id=$('select['+obj+']').val();
+			
+			
+			$(function() {
 				
-				if(typeof storage["district_"+id]==='undefined'||storage["district_"+id]===''){
-					$.ajax({
-						url : '/api/district?did='+id,
-						type : "post",
-						cache : false,
-						dataType : "json",
-						async:false,
-						global : true,
-						success : function(data) {
-							storage.setItem("district_"+id,JSON.stringify(data.districtList));
-							//districtCity(selectDom,data.districtList);
-						},
-						error : function(err) {}
-					});
-				}
 				
-				districtCity=JSON.parse(storage["district_"+id]);
 				
-				var html='';var cityName='';
-				if(typeof selected!=='undefined'){
-					if(selectDom=='departurecity'){
-						cityName=selected.departurecity;
-					}else{
-						cityName=selected.arrivalscity.substring(1);
-					}
-				}
 				
 				
-				for(let i=0;i<districtCity.length;i++){
-					
-					if(typeof selected!=='undefined'&&cityName==districtCity[i].name){
-						html+='<option selected value='+districtCity[i].name+'>'+districtCity[i].name+'</option>';
-					}else{
-						html+='<option value='+districtCity[i].name+'>'+districtCity[i].name+'</option>';
-					}
-				}
-				$("select["+selectDom+"]").html(html);
-			}
-			
-			function buildItinerary(list){
-				var html='';
-				for(let i=0;i<list.length;i++){
-					html+='<tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> '+list[i].departuredate+list[i].arrivalsdate+' '+list[i].departurecity+list[i].arrivalscity+'';
-					html+='<div class="fR"><a href="#route-add" ediStroke data-toggle="modal" dataId="'+i+'" >编辑</a>&nbsp;<a href="#" dataId="'+i+'" removeItinerary class="colRed">移除</a></div></th></tr>';
-					let feeTraveItem=list[i].feeTraveItem;
-					let price=0;
-					for(let k=0;k<feeTraveItem.length;k++){
-						price+=parseFloat(feeTraveItem[k].price);
-						html+='<tr><th>'+feeTraveItem[k].name+'<p class="colGray">#'+feeTraveItem[k].detail+'</p></th><td width="200" class="taR">￥'+feeTraveItem[k].price+'</td></tr>';
-					}
-					html+='<tr><th class="taR">合计</th><td class="colGreen taR">￥'+price+'</td></tr>';
-				}
-				$("tbody[itinerary]").html(html);
-			}
-			
-			function buildFeeTravelItem(feeTraveItem){
 				
-				var html='';
-				for(let i=0;i<feeTraveItem.length;i++){
-					html+='<tr class="remove" ><th>'+feeTraveItem[i].name+'</th>';
-					html+='<td class="taR">￥<input type="number" itemId_'+feeTraveItem[i].id+' data="'+feeTraveItem[i].name+'" dataId="'+feeTraveItem[i].id+'" value="'+feeTraveItem[i].price+'" placeholder="输入费用" pattern="[0-9]" step="1" min="0"class="span2"></td>';
-					html+='<td><input type="text" value="'+feeTraveItem[i].detail+'" itemDetail_'+feeTraveItem[i].id+' placeholder="填写费用说明"></td>';
-					html+='<td><a href="#" removeFeeTravelItem >移除</a></td></tr>';
-				}
-				$("tbody[feeTravelItem]").html(html);
-			}
-			
-			function fnGetItineraryData(){
-				var departurecity=$("select[departurecity] option:selected").text();
-				var arrivalscity=$("select[arrivalscity] option:selected").text();
-				var departureprovince=$("select[departureprovince] option:selected").text();
-				var arrivalsprovince=$("select[arrivalsprovince] option:selected").text();
 				
-				var departuredate=$("input[departuredate]").val();
-				var arrivalsdate=$("input[arrivalsdate]").val();
 				
-				var feeTravePriceList=$("tbody[feeTravelItem]").find('input[type=number]');
-				var feeTraveDetailList=$("tbody[feeTravelItem]").find('input[type=text]');
 				
-				if(arrivalscity!==''){
-					arrivalscity='-'+arrivalscity;
-				}
-				if(arrivalsdate!==''){
-					arrivalsdate='~'+arrivalsdate;
-				}
 				
-				var feeTraveItem=[];
-				for(let i=0;i<feeTravePriceList.length;i++){
-					feeTraveItem.push({'id':$(feeTravePriceList[i]).attr('dataId'),'name':$(feeTravePriceList[i]).attr('data'),'price':$(feeTravePriceList[i]).val(),'detail':$(feeTraveDetailList[i]).val()});
-				}
 				
-				var itinerary={'departuredate':departuredate,'departureprovince':departureprovince,'departurecity':departurecity,'arrivalsdate':arrivalsdate,'arrivalsprovince':arrivalsprovince,'arrivalscity':arrivalscity,'feeTraveItem':feeTraveItem};
-				return itinerary;
-			}
-			
-			$(function() {
 				
-				var sessionStorage= window.sessionStorage;
-				var sessionItinerary= sessionStorage.getItem("itineraryList");
-				if(typeof sessionItinerary!=='object'){
-					buildItinerary(JSON.parse(sessionItinerary));
-					fnTotTravelPrice();
-				}
 				
-				$("a[ediStroke]").click(function() {
-					var sessionItinerary= sessionStorage.getItem("itineraryList");
-					sessionItinerary=JSON.parse(sessionItinerary);
-					var id=$(this).attr('dataId');
-					
-					var storage=window.localStorage;
-					
-					districtTop(sessionItinerary[id]);
-					districtCityBuild('departurecity','departureprovince',sessionItinerary[id]);
-					districtCityBuild('arrivalscity','arrivalsprovince',sessionItinerary[id]);
-					
-					$("input[departuredate]").val(sessionItinerary[id].departuredate);
-					$("input[arrivalsdate]").val(sessionItinerary[id].arrivalsdate.substring(1));
-					
-					buildFeeTravelItem(sessionItinerary[id].feeTraveItem);
-					
-					$("a[additinerarybut]").hide();
-					$("a[ediItineraryBut]").show();
-				});
 				
-				$("a[addStroke]").click(function() {
-					districtTop();
-					districtCityBuild('departurecity','departureprovince');
-					districtCityBuild('arrivalscity','arrivalsprovince');
-					$("input[departuredate]").val('');
-					$("input[arrivalsdate]").val('');
-					$("tbody[feeTravelItem]").html('');
-					
-					$("a[additinerarybut]").show();
-					$("a[ediItineraryBut]").hide();
-				});
 				
-				$("select[departureProvince]").change(function() {
-					districtCityBuild('departurecity','departureprovince');
-				});
 				
-				$("select[arrivalsProvince]").change(function() {
-					districtCityBuild('arrivalscity','arrivalsprovince');
-				});
 				
-				$("a[feeTravelItem]").click(function() {
-					var itemName=$("select[feeTravelItem] option:selected").text();
-					var itemId=$("select[feeTravelItem] option:selected").val();
-					
-					var html='<tr class="remove" ><th>'+itemName+'</th>';
-					html+='<td class="taR">￥<input type="number" itemId_'+itemId+' data="'+itemName+'" dataId="'+itemId+'" value="0" placeholder="输入费用" pattern="[0-9]" step="1" min="0"class="span2"></td>';
-					html+='<td><input type="text" itemDetail_'+itemId+' placeholder="填写费用说明"></td>';
-					html+='<td><a href="#" removeFeeTravelItem >移除</a></td></tr>';
-					$("tbody[feeTravelItem]").append(html);
-					
-				});
 				
-				$("tbody[feeTravelItem]").on("click","a[removeFeeTravelItem]",function(){
-					$(this).closest('.remove').remove();
-				});
 				
-				$("tbody[itinerary]").on("click","a[edistroke]",function(){
-					$("input[name=ediStrokeId]").val($(this).attr('dataid'));
-				});
 				
-				$("a[ediItineraryBut]").click(function() {
-					var itinerary=fnGetItineraryData();
-					var siIndex=$("input[name=ediStrokeId]").val();
-					
-					var sessionItinerary =JSON.parse(sessionStorage.getItem("itineraryList"));
-					
-					sessionItinerary[siIndex]=itinerary;
-					sessionStorage.setItem("itineraryList",JSON.stringify(sessionItinerary));
-					buildItinerary(sessionItinerary);
-					fnTotTravelPrice();
-				});
 				
-				$("a[addItineraryBut]").click(function() {
-					var itinerary=fnGetItineraryData();
-					
-					var sessionItinerary = sessionStorage.getItem("itineraryList");
-					
-					if(typeof sessionItinerary==='object'){
-						sessionItinerary=[];
-						sessionItinerary.push(itinerary);
-						sessionStorage.setItem("itineraryList",JSON.stringify(sessionItinerary));
-					}else{
-						sessionItinerary=JSON.parse(sessionItinerary);
-						sessionItinerary.push(itinerary);
-						sessionStorage.setItem("itineraryList",JSON.stringify(sessionItinerary));
-					}
-					
-					buildItinerary(sessionItinerary);
-					fnTotTravelPrice();
-				});
 				
-				$("tbody[itinerary]").on("click","a[removeItinerary]",function(){
-					
-					var sessionItinerary= sessionStorage.getItem("itineraryList");
-					var id=$(this).attr('dataId');
-					sessionItinerary=JSON.parse(sessionItinerary);
-					sessionItinerary.splice(id,1);
-					sessionStorage.setItem("itineraryList",JSON.stringify(sessionItinerary));
-					buildItinerary(sessionItinerary);
-					
-				});
 				
 				
 				//---------------------------

protected/view/receipt/feeTravelEdi.html

@@ -0,0 +1,774 @@
+<!-- include '../admin/header' -->
+
+<link rel=stylesheet
+	href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css">
+<script type="text/javascript"
+	src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
+<script src="<?= receipt ?>"></script>
+
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="/" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<!-- include '../admin/receipt_menu' -->
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<div class="borad-news">
+					<legend>
+						<div class="fR"></div>
+						申请报销单
+					</legend>
+					<div class="saeaList">
+						<div class="entry receipt-list">
+							<div class="seTable">
+								<input type="hidden" id="travelR" value="{{cSum.travelSum}}" />
+								<form action="/updateReceipt" name="recepitAdd" method="post">
+
+									<input type="hidden" name="rid" value="{{rid}}"/>
+			  				<input type="hidden" name="receiptClass" value="trave"/>
+							<input type="hidden" name="itinerary" id="itinerary" value="" />
+
+									<table class="table table-bordered table-condensed table-hover">
+
+										<tr>
+											<th colspan="2" class="taC">行程详细</th>
+										</tr>
+										<tbody itinerary >
+											
+										</tbody>
+
+										<tr>
+											<th colspan="2" class="taC"><a href="#route-add"
+												class="button" addStroke data-toggle="modal">设置行程费用单</a></th>
+										</tr>
+
+
+
+
+										<tr>
+											<th colspan="2" class="taC">差旅相关费用</th>
+										</tr>
+										<!-- loop acItem -->
+										<!-- if {{acItem' value.category}} =="差旅相关费用" -->
+										<tr>
+											<th>{{acItem' value.name}}</th>
+											<td width="200" class="taR">￥<span travelPrice_{{acItem' value.aid}} ><!-- if !empty({{acItem' value.price}}) --> {{acItem' value.price}} <!-- else --> 0 <!-- endif --></span>
+											<input type="hidden" id="travel_{{acItem' value.aid}}" name="travel[]" <!-- if !empty({{acItem' value.price}}) --> value="{{acItem' value.price}}" <!-- else --> value="0" <!-- endif --> placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2"></td>
+										</tr>
+										<!-- endif -->
+										<!-- endloop -->
+										<tr>
+											<th class="taR">合计</th>
+											<td class="colGreen taR" id="travelResult">￥{{cSum.travelSum}}</td>
+										</tr>
+
+
+
+										<tr class="warning"><td class="taR"><b>本次报销费用合计</b></td><td class="colGreed taR"><b style="font-size:24px" id="RS">￥{{sum}}</b></td></tr>
+	  						
+
+										<!-- if {{receiptDetail.status}}!=4 -->
+	  						<tr>
+								<th>选择审批组</th>
+								<td class="taR">
+								<select name="verify">
+								<!-- loop veList -->
+								<option <!-- if {{receiptDetail.verify}}=={{veList' value.vid}} --> selected <!-- endif --> value="{{veList' value.vid}}" >{{veList' value.description}}（
+								{{veList' value.staff}}）</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>
+	  						<!-- endif -->
+	  						<tr><th colspan="2" class="taC">产生费用所在办事处</th></tr>
+							<tr>
+								<th>选择办事处</th>
+								<td class="taR">
+								<select name="cid" class="span2">
+								<!-- loop category -->
+								<option <!-- if {{receiptDetail.cid}}=={{category' value.cid}} --> selected <!-- endif --> value="{{category' value.cid}}" >{{category' value.title}}</option>
+								<!-- endloop -->
+								</select>
+								</td>
+							</tr>
+
+										<tr><th colspan="2" class="taC">收款信息</th></tr>
+							<tr><th>收款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入收款人户名" ></td>
+							</tr>
+							<tr>
+							<th>收款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">广发银行</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							<tr><th>收款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入收款开户银行名称" >
+							</td></tr>
+							<tr><th>收款账号</th><td>
+							<input type="text" placeholder="请输入收款账号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
+							</td></tr>
+							<tr node-cn style="display:none" ><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是广发银行，务必填上银行联行号）</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
+							</td></tr>
+	  						
+	  						<tr><th colspan="2" class="taC">报销说明</th></tr>
+	  						<tr><th colspan="2">
+	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="市内交通费、邮寄费、公关费、办公费等费用说明，请详细填写在这。">{{receiptDetail.explanation}}</textarea>
+	  						</th></tr>
+
+
+										<tr><th colspan="2" class="taC">附件</th></tr>
+	  						<tr><td colspan="2">
+	  							
+	  							<!--已上传文件-->
+	  							<table class="table" >
+	  								<thead>
+	  								<tr>
+	  								<th>
+	  									<input enclosurFile type="file" 
+	  								accept="image/png,image/gif,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document
+	  								,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel" name="file" />
+	  								
+										<input type="hidden" id="enclosurName" name="enclosurName" value="">
+	  								
+	  								</th>
+	  								<th colspan="2">
+	  								<span class="fieldset flash" id="fsUploadProgress"></span>
+									<span id="divStatus">0 个文件已上传</span>
+									
+										
+	  								</th></tr>
+	  								<tr><th>文件名</th><th>大小</th><th>操作</th></tr></thead>
+	  								<tbody id="KT">
+	  								
+	  								<!-- loop enclosurList -->
+	  								<tr id="{{enclosurList' value.eidKey}}">
+	  								<td><a href="/upload/swfupload/{{enclosurList' value.name}}" target="_blank">{{enclosurList' value.name}}</a></td>
+	  								<td></td>
+	  								<td><a href="javascript:void(0)" onclick="delEnclosurByKey('{{enclosurList' value.eidKey}}')">删除</a></td>
+	  								</tr>
+	  								<!-- endloop -->
+	  								</tbody>
+	  							</table>		
+	  						</td></tr>
+
+
+
+									</table>
+									<table class="table">
+										<tr>
+											<td><input type="submit" value="生成报销单 >>" class="button" /></td>
+										</tr>
+									</table>
+								</form>
+							</div>
+							<div class="seCensor receipt-censor">
+								<div class="title">报销单填写说明</div>
+								<div class="detail">
+									<p>1 办事处水电费标准100元，标准内实报；</p>
+									<p>
+										2 <b>产生费用所在办事处</b> 默认使用您所在的第一个办事处；
+									</p>
+									<p>
+										3 邮寄费、公关费、办公费等详细说明请填写到 <b>报销说明</b>。
+									</p>
+								</div>
+								
+								<div class="itinerary">
+			  						<h2 class="itineraryTitle">总行程单</h2>
+			  						<div class="itineraryCon" >
+			  							<ul itineraryinfo>
+			  								
+			  							</ul>
+			  						</div>
+			  					</div>
+								
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!--弹出 添加行程 -->
+		<div class="modal hide fade" id="route-add">
+			<div class="modal-dialog">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h3>设置行程费用单</h3>
+					</div>
+					<div class="modal-body saeaList">
+						<input type="hidden" name="ediStrokeId" >
+						<table class="table table-bordered table-condensed">
+							<tr>
+								<th class="taC" colspan="4">出发-到达</th>
+							</tr>
+							<tr>
+								<th>出发地</th>
+								<td>
+								<select departureProvince >
+								
+								</select>
+								<select departureCity>
+								
+								</select>
+								</td>
+								<th>到达地</th>
+								<td>
+								<select arrivalsProvince ></select>
+								<select arrivalsCity></select>
+								</td>
+							</tr>
+							<tr>
+								<th>出发日期</th>
+								<td><input type="date" departureDate ></td>
+								<th>到达日期</th>
+								<td><input type="date" arrivalsDate ></td>
+							</tr>
+							<tr>
+								<td colspan="4" class="colGray">如果是停留，出发地和到达地填写住宿地。（如：广东省珠海市-广东省珠海市）</td>
+							</tr>
+						</table>
+						<select feeTravelItem >
+						
+						<!-- loop acItem -->
+										<!-- if {{acItem' value.category}} =="差旅相关费用" -->
+										<option value='{{acItem' value.aid}}'>{{acItem' value.name}}</option>
+										
+										<!-- endif -->
+						<!-- endloop -->
+						
+						
+							</select><a href="#" feeTravelItem class="button">添加费用</a>
+						<table class="table table-bordered table-condensed">
+							<tr>
+								<th colspan="4" class="taC">费用详情</th>
+							</tr>
+							<tbody feeTravelItem >
+							</tbody>
+							
+						</table>
+					</div>
+					<div class="modal-footer">
+						<a href="#" addItineraryBut class="button" data-dismiss="modal" aria-hidden="true">确认</a>
+						<a href="#" ediItineraryBut style="display:none" class="button" data-dismiss="modal" aria-hidden="true">确认</a>
+						<a href="#" class="button btn-gray" data-dismiss="modal"
+							aria-hidden="true">关闭</a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<!--结束 弹出 添加行程 -->
+
+
+
+
+
+		<script type="text/javascript">
+			autoFlashHeight();
+			var sessionStorageList='itineraryListEdi';
+			sessionStorage.setItem("itineraryListEdi",'{{receiptDetail.itinerary}}');
+		</script>
+		
+		<script src="<?= itinerary ?>"></script>
+		
+		<script>
+		
+			/* function fnTotTravelPrice(){
+				var itineraryStr=sessionStorage.getItem("itineraryListEdi");
+				var sessionItinerary= JSON.parse(itineraryStr);
+				$("#itinerary").val(itineraryStr);
+				var priceList=[];
+				for(let i=0;i<sessionItinerary.length;i++){
+					let feeTraveItem=sessionItinerary[i].feeTraveItem;
+					for(let k=0;k<feeTraveItem.length;k++){
+						if(typeof priceList[feeTraveItem[k].id]==='undefined'){
+							priceList[feeTraveItem[k].id]=0;
+						}
+						priceList[feeTraveItem[k].id]+=parseFloat(feeTraveItem[k].price);
+					}
+				}
+				
+				$("input[id^='travel_']").val(0);
+				$("td span").html(0);
+				
+				let travelResult=0;
+				for(let i=0;i<priceList.length;i++){
+					
+					if(typeof priceList[i]==='number'){
+						console.log("#travel_"+i+"");
+						$("span[travelprice_"+i+"]").html(priceList[i]);
+						$("#travel_"+i+"").val(priceList[i]);
+						travelResult+=priceList[i];
+					}
+				}
+
+				$("#travelResult").html(travelResult);
+				$("#RS").html(travelResult);
+			}
+		
+			function districtTop(selected){
+				
+				var storage=window.localStorage;
+				
+				if(typeof storage["districtTop"]==='undefined'||storage["districtTop"]===''){
+					$.ajax({
+						url : '/api/district',
+						type : "post",
+						cache : false,
+						dataType : "json",
+						global : true,
+						success : function(data) {
+							storage.setItem("districtTop",JSON.stringify(data.districtList));
+							//districtTop(data.districtList);
+							
+						},
+						error : function(err) {}
+					});
+				}
+				
+				var districtTop=JSON.parse(storage["districtTop"]);
+				
+				var html='';
+				for(let i=0;i<districtTop.length;i++){
+					if(typeof selected!=='undefined'&&selected.departureprovince==districtTop[i].name){
+						html+='<option selected value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
+					}else{
+						html+='<option value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
+					}
+					
+				}
+				$("select[departureProvince]").html(html);
+				
+				html='';
+				for(let i=0;i<districtTop.length;i++){
+					if(typeof selected!=='undefined'&&selected.arrivalsprovince==districtTop[i].name){
+						html+='<option selected value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
+					}else{
+						html+='<option value='+districtTop[i].id+'>'+districtTop[i].name+'</option>';
+					}
+					
+				}
+				$("select[arrivalsProvince]").html(html);
+			}
+		
+			function districtCityBuild(selectDom,obj,selected){
+				
+				var storage=window.localStorage;
+				var id=$('select['+obj+']').val();
+				
+				if(typeof storage["district_"+id]==='undefined'||storage["district_"+id]===''){
+					$.ajax({
+						url : '/api/district?did='+id,
+						type : "post",
+						cache : false,
+						dataType : "json",
+						async:false,
+						global : true,
+						success : function(data) {
+							storage.setItem("district_"+id,JSON.stringify(data.districtList));
+							//districtCity(selectDom,data.districtList);
+						},
+						error : function(err) {}
+					});
+				}
+				
+				districtCity=JSON.parse(storage["district_"+id]);
+				
+				var html='';var cityName='';
+				if(typeof selected!=='undefined'){
+					if(selectDom=='departurecity'){
+						cityName=selected.departurecity;
+					}else{
+						cityName=selected.arrivalscity.substring(1);
+					}
+				}
+				
+				
+				for(let i=0;i<districtCity.length;i++){
+					
+					if(typeof selected!=='undefined'&&cityName==districtCity[i].name){
+						html+='<option selected value='+districtCity[i].name+'>'+districtCity[i].name+'</option>';
+					}else{
+						html+='<option value='+districtCity[i].name+'>'+districtCity[i].name+'</option>';
+					}
+				}
+				$("select["+selectDom+"]").html(html);
+			}
+			
+			function buildItinerary(list){
+				var html='';
+				for(let i=0;i<list.length;i++){
+					html+='<tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> '+list[i].departuredate+list[i].arrivalsdate+' '+list[i].departurecity+list[i].arrivalscity+'';
+					html+='<div class="fR"><a href="#route-add" ediStroke data-toggle="modal" dataId="'+i+'" >编辑</a>&nbsp;<a href="#" dataId="'+i+'" removeItinerary class="colRed">移除</a></div></th></tr>';
+					let feeTraveItem=list[i].feeTraveItem;
+					let price=0;
+					for(let k=0;k<feeTraveItem.length;k++){
+						price+=parseFloat(feeTraveItem[k].price);
+						html+='<tr><th>'+feeTraveItem[k].name+'<p class="colGray">#'+feeTraveItem[k].detail+'</p></th><td width="200" class="taR">￥'+feeTraveItem[k].price+'</td></tr>';
+					}
+					html+='<tr><th class="taR">合计</th><td class="colGreen taR">￥'+price+'</td></tr>';
+				}
+				$("tbody[itinerary]").html(html);
+			}
+			
+			function buildFeeTravelItem(feeTraveItem){
+				
+				var html='';
+				for(let i=0;i<feeTraveItem.length;i++){
+					html+='<tr class="remove" ><th>'+feeTraveItem[i].name+'</th>';
+					html+='<td class="taR">￥<input type="number" itemId_'+feeTraveItem[i].id+' data="'+feeTraveItem[i].name+'" dataId="'+feeTraveItem[i].id+'" value="'+feeTraveItem[i].price+'" placeholder="输入费用" pattern="[0-9]" step="1" min="0"class="span2"></td>';
+					html+='<td><input type="text" value="'+feeTraveItem[i].detail+'" itemDetail_'+feeTraveItem[i].id+' placeholder="填写费用说明"></td>';
+					html+='<td><a href="#" removeFeeTravelItem >移除</a></td></tr>';
+				}
+				$("tbody[feeTravelItem]").html(html);
+			}
+			
+			function fnGetItineraryData(){
+				var departurecity=$("select[departurecity] option:selected").text();
+				var arrivalscity=$("select[arrivalscity] option:selected").text();
+				var departureprovince=$("select[departureprovince] option:selected").text();
+				var arrivalsprovince=$("select[arrivalsprovince] option:selected").text();
+				
+				var departuredate=$("input[departuredate]").val();
+				var arrivalsdate=$("input[arrivalsdate]").val();
+				
+				var feeTravePriceList=$("tbody[feeTravelItem]").find('input[type=number]');
+				var feeTraveDetailList=$("tbody[feeTravelItem]").find('input[type=text]');
+				
+				if(arrivalscity!==''){
+					arrivalscity='-'+arrivalscity;
+				}
+				if(arrivalsdate!==''){
+					arrivalsdate='~'+arrivalsdate;
+				}
+				
+				var feeTraveItem=[];
+				for(let i=0;i<feeTravePriceList.length;i++){
+					feeTraveItem.push({'id':$(feeTravePriceList[i]).attr('dataId'),'name':$(feeTravePriceList[i]).attr('data'),'price':$(feeTravePriceList[i]).val(),'detail':$(feeTraveDetailList[i]).val()});
+				}
+				
+				var itinerary={'departuredate':departuredate,'departureprovince':departureprovince,'departurecity':departurecity,'arrivalsdate':arrivalsdate,'arrivalsprovince':arrivalsprovince,'arrivalscity':arrivalscity,'feeTraveItem':feeTraveItem};
+				return itinerary;
+			} */
+			
+			$(function() {
+				
+				/* var sessionStorage= window.sessionStorage;
+				sessionStorage.setItem("itineraryListEdi",'{{receiptDetail.itinerary}}');
+				var sessionItinerary= sessionStorage.getItem("itineraryListEdi");
+				if(typeof sessionItinerary!=='object'){
+					buildItinerary(JSON.parse(sessionItinerary));
+					fnTotTravelPrice();
+				}
+				
+				$("a[ediStroke]").click(function() {
+					var sessionItinerary= sessionStorage.getItem("itineraryListEdi");
+					sessionItinerary=JSON.parse(sessionItinerary);
+					var id=$(this).attr('dataId');
+					
+					var storage=window.localStorage;
+					
+					districtTop(sessionItinerary[id]);
+					districtCityBuild('departurecity','departureprovince',sessionItinerary[id]);
+					districtCityBuild('arrivalscity','arrivalsprovince',sessionItinerary[id]);
+					
+					$("input[departuredate]").val(sessionItinerary[id].departuredate);
+					$("input[arrivalsdate]").val(sessionItinerary[id].arrivalsdate.substring(1));
+					
+					buildFeeTravelItem(sessionItinerary[id].feeTraveItem);
+					
+					$("a[additinerarybut]").hide();
+					$("a[ediItineraryBut]").show();
+				});
+				
+				$("a[addStroke]").click(function() {
+					districtTop();
+					districtCityBuild('departurecity','departureprovince');
+					districtCityBuild('arrivalscity','arrivalsprovince');
+					$("input[departuredate]").val('');
+					$("input[arrivalsdate]").val('');
+					$("tbody[feeTravelItem]").html('');
+					
+					$("a[additinerarybut]").show();
+					$("a[ediItineraryBut]").hide();
+				});
+				
+				$("select[departureProvince]").change(function() {
+					districtCityBuild('departurecity','departureprovince');
+				});
+				
+				$("select[arrivalsProvince]").change(function() {
+					districtCityBuild('arrivalscity','arrivalsprovince');
+				});
+				
+				$("a[feeTravelItem]").click(function() {
+					var itemName=$("select[feeTravelItem] option:selected").text();
+					var itemId=$("select[feeTravelItem] option:selected").val();
+					
+					var html='<tr class="remove" ><th>'+itemName+'</th>';
+					html+='<td class="taR">￥<input type="number" itemId_'+itemId+' data="'+itemName+'" dataId="'+itemId+'" value="0" placeholder="输入费用" pattern="[0-9]" step="1" min="0"class="span2"></td>';
+					html+='<td><input type="text" itemDetail_'+itemId+' placeholder="填写费用说明"></td>';
+					html+='<td><a href="#" removeFeeTravelItem >移除</a></td></tr>';
+					$("tbody[feeTravelItem]").append(html);
+					
+				});
+				
+				$("tbody[feeTravelItem]").on("click","a[removeFeeTravelItem]",function(){
+					$(this).closest('.remove').remove();
+				});
+				
+				$("tbody[itinerary]").on("click","a[edistroke]",function(){
+					$("input[name=ediStrokeId]").val($(this).attr('dataid'));
+					
+					var sessionItinerary= sessionStorage.getItem("itineraryListEdi");
+					sessionItinerary=JSON.parse(sessionItinerary);
+					var id=$(this).attr('dataId');
+					
+					var storage=window.localStorage;
+					
+					districtTop(sessionItinerary[id]);
+					districtCityBuild('departurecity','departureprovince',sessionItinerary[id]);
+					districtCityBuild('arrivalscity','arrivalsprovince',sessionItinerary[id]);
+					
+					$("input[departuredate]").val(sessionItinerary[id].departuredate);
+					$("input[arrivalsdate]").val(sessionItinerary[id].arrivalsdate.substring(1));
+					
+					buildFeeTravelItem(sessionItinerary[id].feeTraveItem);
+					
+					$("a[additinerarybut]").hide();
+					$("a[ediItineraryBut]").show();
+					
+				});
+				
+				$("a[ediItineraryBut]").click(function() {
+					var itinerary=fnGetItineraryData();
+					var siIndex=$("input[name=ediStrokeId]").val();
+					
+					var sessionItinerary =JSON.parse(sessionStorage.getItem("itineraryListEdi"));
+					
+					sessionItinerary[siIndex]=itinerary;
+					sessionStorage.setItem("itineraryListEdi",JSON.stringify(sessionItinerary));
+					buildItinerary(sessionItinerary);
+					fnTotTravelPrice();
+				});
+				
+				$("a[addItineraryBut]").click(function() {
+					var itinerary=fnGetItineraryData();
+					
+					var sessionItinerary = sessionStorage.getItem("itineraryListEdi");
+					
+					if(typeof sessionItinerary==='object'){
+						sessionItinerary=[];
+						sessionItinerary.push(itinerary);
+						sessionStorage.setItem("itineraryListEdi",JSON.stringify(sessionItinerary));
+					}else{
+						sessionItinerary=JSON.parse(sessionItinerary);
+						sessionItinerary.push(itinerary);
+						sessionStorage.setItem("itineraryListEdi",JSON.stringify(sessionItinerary));
+					}
+					
+					buildItinerary(sessionItinerary);
+					fnTotTravelPrice();
+				});
+				
+				$("tbody[itinerary]").on("click","a[removeItinerary]",function(){
+					
+					var sessionItinerary= sessionStorage.getItem("itineraryListEdi");
+					var id=$(this).attr('dataId');
+					sessionItinerary=JSON.parse(sessionItinerary);
+					sessionItinerary.splice(id,1);
+					sessionStorage.setItem("itineraryListEdi",JSON.stringify(sessionItinerary));
+					buildItinerary(sessionItinerary);
+					$("#itinerary").val(JSON.stringify(sessionItinerary));
+					buildItinerary(sessionItinerary);
+					fnTotTravelPrice();
+				}); */
+				
+				
+				//---------------------------
+				
+				$("input[id^='inttrain_']").change(function() {
+
+					$i = 0;
+					$("input[id^='inttrain_']").each(function(i) {
+						$i += parseFloat(this.value);
+
+					});
+					$("#inttrainResult").html("￥" + $i.toFixed(2));
+					$("#inttrainR").val($i.toFixed(2));
+
+					var agencyR = $("#agencyR").val();
+					var otherR = parseFloat($("#otherR").val());
+
+					var RS = parseFloat($i) + parseFloat(agencyR) + otherR;
+
+					$("#RS").html("￥" + RS.toFixed(2));
+				});
+
+				$("select[bindInvoice]").change(function() {
+
+					var option = $(this).val();
+					if (option != 0) {
+						$("div[invoice]").show();
+
+					} else {
+						$("div[invoice]").hide();
+					}
+				});
+
+				$("input[publicRelationsInput]").keyup(function() {
+					var price = $(this).val();
+					if (price != 0) {
+						$("tbody[publicRelations]").show();
+						$("span[publicRelationsPrice]").html(price);
+
+					} else {
+						$("tbody[publicRelations]").hide();
+					}
+				});
+
+				$('tbody[invoiceList]').delegate("a[node-invoice='INFO']",
+						'click', function() {
+							var postData = $(this).attr("data-isKey");
+							var type = $(this).attr("data-type");
+							invoice(postData, type);
+
+						});
+
+				$('div[invoice]').delegate("a[node-invoice='INFO']", 'click',
+						function() {
+							var postData = $(this).attr("data-isKey");
+							var type = $(this).attr("data-type");
+							invoice(postData, type);
+
+						});
+
+				$("button[search_invoice]").click(function() {
+					var wd = $("input[wd]").val();
+
+					var params = {
+						where : {
+							'invoiceTitle_like' : wd,
+							'untreadStatus_or' : [ 0, 3 ],
+							'status_or' : [ 1, 2 ],
+						}
+					};
+
+					params = JSON.stringify(params);
+
+					$.ajax({
+						url : '/api/invoice?filter=' + params,
+						type : "get",
+						cache : false,
+						dataType : "json",
+						success : function(data) {
+							buildInvoice(data);
+
+						},
+						error : function(err) {
+						}
+					});
+
+				});
+
+			})
+			function buildInvoice(data) {
+				var html = '';
+				for (var i = 0; i < data.length; i++) {
+					html += '<tr><td>' + data[i]['invoiceTitle'] + '</td><td>￥'
+							+ data[i]['invoicePrice'];
+					if (data[i]['invoiceType'] == 1) {
+						html += '专';
+					}
+					html += '</td>';
+					if (data[i]['settlementType'] == 1) {
+						html += '<td>培训班（<a href="/invoiceTrainingDetail/'+data[i]['trainId']+'.html" target="_blank">查看</a>）</td>';
+					} else {
+						html += '<td>软件销售</td>';
+					}
+
+					html += '<td>' + data[i]['categoryName'] + ''
+							+ data[i]['userName'] + '<br> ' + data[i]['date']
+							+ '</td><td>' + data[i]['printer'] + '<br>'
+							+ data[i]['printTime'] + '</td>';
+					html += '<td><a href="#invdetail" node-invoice="INFO" data-iskey="'+data[i]['iid']+'" data-toggle="modal">'
+							+ data[i]['invoiceSerial'] + '</a></td>';
+					html += '<td><a class="button btn-block" data-dismiss="modal" aria-hidden="true" onclick="bind_invoice(\''
+							+ data[i]['iid']
+							+ '\',\''
+							+ data[i]['invoiceSerial']
+							+ '\')" href="#">添加</a></td></tr>';
+				}
+				$('tbody[invoiceList]').html(html);
+
+			}
+			function bind_invoice(iid, invoiceSerial) {
+				var html = '<a href="#invdetail" node-invoice="INFO" data-iskey="'+iid+'" data-toggle="modal">'
+						+ invoiceSerial + '</a>';
+				html += '<a href="#invdetail" onclick="remove_invoice()"  class="fR">移除</a>';
+				$('#iid').val(iid);
+				$('th[binded_invoce]').html(html);
+			}
+
+			function remove_invoice() {
+				$('#iid').val('');
+				$('th[binded_invoce]').html('');
+			}
+
+			function invoice(postData, type) {
+				/*  var postData = $(this).attr("data-isKey");
+					var type =$(this).attr("data-type"); */
+
+				var po = 'INVOICE';
+				if (type == 'receivables')
+					po = 'RECEIVABLES';
+
+				$("div[loading-msg='true']").html(
+						"<img src='/global/img/loadIco.gif' />");
+				var url = "/ajaxGetInvoiceInfoByType";
+				$.ajax({
+					url : url,
+					type : "post",
+					cache : false,
+					dataType : "json",
+					data : {
+						serial : postData,
+						type : po
+					},
+					global : true,
+					success : function(data) {
+						if (data.status == 1) {
+							$("div[loading-msg='true']").html("");
+							if (type == 'receivables')
+								$("#nr").html(data.html);
+							else
+								$("#nc").html(data.html);
+						} else
+							$("div[loading-msg='true']")
+									.html("illegal request");
+					},
+					error : function(err) {
+						$("div[loading-msg='true']").html("");
+						$("#nr").html('');
+						$("#nc").html('');
+					}
+				});
+			}
+		</script>
+</body>

protected/view/receipt/receiptFee.html

@@ -346,7 +346,17 @@
         </div>
     </div>	
 <script type="text/javascript">
+
+function unsetSL(){
+	var sessionStorage= window.sessionStorage;
+	sessionStorage.clear()
+}
+
 $(function() {
+	
+	<!-- if {{travel}} -->
+	unsetSL();
+	<!-- endif -->
 	$("input[name='feeType']").click(function() {
 		 var feeType = $(this).val();
 		 if(feeType==1){

protected/view/receipt/receiptImplementLoan.html

@@ -1,4 +1,9 @@
 <!-- include '../admin/header' -->
+<link rel=stylesheet
+	href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css">
+<script type="text/javascript"
+	src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
  <script src="<?= receipt ?>"></script>
  
 <body>
@@ -102,30 +107,71 @@
 						<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
 	  					
+	  					<!-- if {{receiptList' value.receiptClass}}==1 -->
 	  						<tr><th colspan="2" class="taC">日常相关费用</th></tr>
 	  						<!-- loop receiptList' value.accountItem.日常相关费用 -->
 	  							<tr><th>{{receiptList' value' value.name}}</th><td width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptList' value.accountItem.cSum.agencySum}}</td></tr>
-	  						
+	  						<tr><th colspan="2" class="taC">其他</th></tr>
+	  						<!-- loop receiptDetail' value.accountItem.其他 -->
+	  						<tr><th>{{receiptDetail' value' value.name}}</th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.otherSum}}</td></tr>
+	  					<!-- elseif {{receiptList' value.receiptClass}}==2 -->
+	  					
+	  					<tr>
+											<th colspan="2" class="taC">行程详细</th>
+										</tr>
+										<tbody itinerary >
+											
+										</tbody>
+	  					
+	  					
 	  						<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
 	  						<!-- loop receiptDetail' value.accountItem.差旅相关费用 -->
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.travelSum}}</td></tr>
-	  						
-	  						<tr><th colspan="2" class="taC">培训班费用</th></tr>
-	  						<!-- loop receiptDetail' value.accountItem.培训班费用 -->
+	  					<!-- elseif {{receiptList' value.receiptClass}}==3 -->
+	  						<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+	  						<!-- loop receiptDetail' value.accountItem.内部培训费用 -->
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.trainSum}}</td></tr>
-	  						
+	  					<!-- else -->
+	  					
+	  						<tr><th colspan="2" class="taC">日常相关费用</th></tr>
+	  						<!-- loop receiptList' value.accountItem.日常相关费用 -->
+	  							<tr><th>{{receiptList' value' value.name}}</th><td width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptList' value.accountItem.cSum.agencySum}}</td></tr>
 	  						<tr><th colspan="2" class="taC">其他</th></tr>
 	  						<!-- loop receiptDetail' value.accountItem.其他 -->
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
 	  						<!-- endloop -->
-	  						
 	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.otherSum}}</td></tr>
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
+	  						<!-- loop receiptDetail' value.accountItem.差旅相关费用 -->
+	  						<tr><th>{{receiptDetail' value' value.name}}</th><td width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.travelSum}}</td></tr>
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+	  						<!-- loop receiptDetail' value.accountItem.内部培训费用 -->
+	  						<tr><th>{{receiptDetail' value' value.name}}</th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.trainSum}}</td></tr>
+	  					
+	  					<!-- endif -->
+	  						
+	  						
+	  						
+	  						
+	  						
 	  						<tr><th colspan="2" class="taC">报销金额调整</th></tr>
 	  						<!-- loop receiptList' value.reviseDetail -->
 	  						<tr><th><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
@@ -496,5 +542,34 @@
 		</div>
 	</div>
 	
+	<script type="text/javascript">
+	function buildItinerary(list){
+				var html='';
+				for(let i=0;i<list.length;i++){
+					html+='<tr><th colspan="2" class="ta"><i class="contactsMark icon-">P</i> '+list[i].departuredate+list[i].arrivalsdate+' '+list[i].departurecity+list[i].arrivalscity+'';
+					html+='</th></tr>';
+					let feeTraveItem=list[i].feeTraveItem;
+					let price=0;
+					for(let k=0;k<feeTraveItem.length;k++){
+						price+=parseFloat(feeTraveItem[k].price);
+						html+='<tr><th>'+feeTraveItem[k].name+'<p class="colGray">#'+feeTraveItem[k].detail+'</p></th><td width="200" class="taR">￥'+feeTraveItem[k].price+'</td></tr>';
+					}
+					html+='<tr><th class="taR">合计</th><td class="colGreen taR">￥'+price+'</td></tr>';
+				}
+				$("tbody[itinerary]").html(html);
+			}
+	
+	$(function() {
+				
+				var sessionStorage= window.sessionStorage;
+				sessionStorage.setItem("itineraryListApproval",'{{receiptList.0.itinerary}}');
+				var sessionItinerary= sessionStorage.getItem("itineraryListApproval");
+				if(typeof sessionItinerary!=='object'){
+					buildItinerary(JSON.parse(sessionItinerary));
+					
+				}
+	})
+	</script>
+	
 <script type="text/javascript">autoFlashHeight();</script>	
 </body>

protected/view/receipt/receiptTrain.html

@@ -170,14 +170,21 @@ $(function() {
 			  			
 			  			<table class="table table-condensed table-hover table-bordered" >
 								<tbody><tr>
-									<th class="taC" rowspan="2">汇总项目</th><th class="taC" colspan="2">收入按开票金额计算</th><th class="taC" colspan="2">收入按入账金额计算</th>
+									<th class="taC" rowspan="2">汇总项目</th>
+									<th class="taC" colspan="2">收入按开票金额计算</th>
+									<th class="taC" colspan="2">收入按入账金额计算</th>
+									<th class="taC" colspan="2" style="background: #ccc;">收入按入账金额计算<span class="colRed">（新）</span></th>
 								</tr><tr>
-									<th class="taC">金额</th><th class="taC" rowspan="2">占比</th><th class="taC">金额</th><th class="taC" rowspan="2">占比</th>
+									<th class="taC">金额</th><th class="taC" rowspan="2">占比</th>
+									<th class="taC">金额</th><th class="taC" rowspan="2">占比</th>
+									<th class="taC">金额</th><th class="taC" rowspan="2">占比</th>
 								</tr>
 								<tr>
 									<th>收入</th>
 									<td class="taR">{{invoiceTrainingDetail.invoiceTotalAmount}}</td>
 									<td class="taR">{{invoiceTrainingDetail.invoiceArriveAmountM}}</td>
+									
+									<td class="taR">{{invoiceTrainingDetail.billPrice}}</td>
 								</tr>
 								<tr>
 									<th>支出</th>
@@ -186,6 +193,9 @@ $(function() {
 									
 									<td class="taR">{{total}}</td>
 									<td class="taR">{{totalProportion}}%</td>
+									
+									<td class="taR">{{total}}</td>
+									<td class="taR">{{totalBillProportion}}%</td>
 								</tr>
 								<tr>
 									<th>利润</th>
@@ -194,9 +204,12 @@ $(function() {
 									
 									<td class="taR"><b>{{profit}}</b></td>
 									<td class="taR">{{profitProportion}}%</td>
+									
+									<td class="taR"><b>{{billProfit}}</b></td>
+									<td class="taR">{{profitBillProportion}}%</td>
 								</tr>
 								<tr>
-									<td colspan="5" class="taC colGray">收入-支出=利润</td>
+									<td colspan="7" class="taC colGray">收入-支出=利润</td>
 								</tr>
 								<tr>
 									<th>公司利润</th>
@@ -204,6 +217,9 @@ $(function() {
 									<td class="taR">{{invoicecompanyProfitProportion}}%</td>
 									<td class="taR">{{companyProfit}}</td>
 									<td class="taR">{{companyProfitProportion}}%</td>
+									
+									<td class="taR">{{companyBillProfit}}</td>
+									<td class="taR">{{companyBillProfitProportion}}%</td>
 								</tr>
 								<tr>
 									<th>办事处利润</th>
@@ -211,6 +227,9 @@ $(function() {
 									<td class="taR">{{invoicecategoryProportion}}%</td>
 									<td class="taR">{{categoryProfit}}</td>
 									<td class="taR">{{categoryProportion}}%</td>
+									
+									<td class="taR">{{categoryBillProfit}}</td>
+									<td class="taR">{{categoryBillProportion}}%</td>
 								</tr>
 								<tr>
 									<th>公司收款</th>
@@ -218,9 +237,12 @@ $(function() {
 									<td class="taR">{{invoiceTotalAmountProportionB}}%</td>
 									<td class="taR">{{invoiceTrainingDetail.invoiceCompanyAmountM}}</td>
 									<td class="taR">{{invoiceTotalAmountProportion}}%</td>
+									
+									<td class="taR">{{invoiceTrainingDetail.invoiceCompanyAmountM}}</td>
+									<td class="taR">{{invoiceBillTotalAmountProportion}}%</td>
 								</tr>
 								<tr>
-									<td colspan="5" class="taC colGray">收入×40%=办事处利润&nbsp;&nbsp;&nbsp;收入×60%=公司利润</td>
+									<td colspan="7" class="taC colGray">收入×40%=办事处利润&nbsp;&nbsp;&nbsp;收入×60%=公司利润</td>
 								</tr>
 								<tr>
 									<th>备用金（借款）</th>
@@ -228,6 +250,9 @@ $(function() {
 									<td class="taR">{{invoicesumProportion}}%</td>
 									<td class="taR">{{receiptLoanDetail.sum}}</td>
 									<td class="taR">{{sumProportion}}%</td>
+									
+									<td class="taR">{{receiptLoanDetail.sum}}</td>
+									<td class="taR">{{sumProportion}}%</td>
 								</tr>
 								<tr>
 									<th>办事处收款</th>
@@ -235,6 +260,9 @@ $(function() {
 									<td class="taR">{{invoiceRIAmountProportion}}%</td>
 									<td class="taR">{{invoiceTrainingDetail.RIAmount}}</td>
 									<td class="taR">{{RIAmountProportion}}%</td>
+									
+									<td class="taR">{{invoiceTrainingDetail.RIAmount}}</td>
+									<td class="taR">{{RIAmountProportion}}%</td>
 								</tr>
 								<tr>
 									<th>办事处实际支出</th>
@@ -242,6 +270,9 @@ $(function() {
 									<td class="taR">{{ICAEP}}%</td>
 									<td class="taR">{{categoryActualExpenditure}}</td>
 									<td class="taR">{{categoryActualExpenditureProportion}}%</td>
+									
+									<td class="taR">{{categoryActualExpenditure}}</td>
+									<td class="taR">{{categoryActualExpenditureProportion}}%</td>
 								</tr>
 								<tr>
 									<th>付总部款</th>
@@ -249,11 +280,14 @@ $(function() {
 									<td class="taR">{{invoicepaymentProportion}}%</td>
 									<td class="taR"><b>{{payment}}</b></td>
 									<td class="taR">{{paymentProportion}}%</td>
+									
+									<td class="taR"><b>{{payment}}</b></td>
+									<td class="taR">{{paymentProportion}}%</td>
 								</tr>
 								<tr>
-									<td colspan="5" class="taC colGray">备用金+办事处收款-办事处实际支出=付总部款</td>
+									<td colspan="7" class="taC colGray">备用金+办事处收款-办事处实际支出=付总部款</td>
 								</tr>
-								<tr><td colspan="5">学员：{{receiptTrainingDetail.participantsTotal}}人(缴费{{receiptTrainingDetail.participants}}&nbsp;免费{{receiptTrainingDetail.freeParticipants}})&nbsp;&nbsp;&nbsp;讲师：{{lectureCount}} 人</td></tr>
+								<tr><td colspan="7">学员：{{receiptTrainingDetail.participantsTotal}}人(缴费{{receiptTrainingDetail.participants}}&nbsp;免费{{receiptTrainingDetail.freeParticipants}})&nbsp;&nbsp;&nbsp;讲师：{{lectureCount}} 人</td></tr>
 						</tbody></table>
 			  			
 			  			

protected/view/receipt/receiptTrainInvoice.html

@@ -30,7 +30,7 @@ $('a[CANCELReceivablesI]').click(function() {
 		global : true,
 		success : function(data) {
 			if (data.status == 1) {
-$('#RTRI_'+iidKey).html('');
+			$('#RTRI_'+iidKey).html('');
 			} else{
 				alert('操作失败');
 			}	
@@ -83,6 +83,7 @@ $('#RTRI_'+iidKey).html('');
                                     <th class="taC" width="90">包含发票</th>
                                     <th class="taC">开票金额合计</th>
                                     <th class="taC">入账金额合计</th>
+                                    <th class="taC" style="background: #ccc;">入账金额合计<span class="colRed">（新）</span></th>
                                     <th class="taC">公司已收款</th>
                                     <th class="taC">办事处已收款</th>
                                     <th class="taC" width="90">入账完成度</th>
@@ -95,6 +96,7 @@ $('#RTRI_'+iidKey).html('');
                                     <td>{{invoiceTrainingDetail.invoiceTotal}}</td>
                                     <td>￥{{invoiceTrainingDetail.invoiceTotalAmount}}</td>
                                     <td>￥{{invoiceTrainingDetail.invoiceArriveAmount}}</td>
+                                    <td>￥{{invoiceTrainingDetail.billPrice}}</td>
                                      <td>￥{{invoiceTrainingDetail.invoiceCompanyAmount}}</td>
                                     <td>￥{{invoiceTrainingDetail.RIAmount}}</td>
                                     <td>{{invoiceTrainingDetail.arriveSchedule}}%</td>