开始修改流水银行到款时间问题

protected/config/js.edition.conf.php

@@ -4,10 +4,13 @@ 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.23' );
-define ( "itinerary2", WEB_SITE_GLOBAL.'js/itinerary2.0.js?1.00' );
+define ( "itinerary", WEB_SITE_GLOBAL.'js/itinerary.js?1.25' );
 define ( "itineraryView", WEB_SITE_GLOBAL.'js/itineraryView.js?1.12' );
 
+define ( "itinerary2", WEB_SITE_GLOBAL.'js/itinerary2.0.js?1.00' );
+define ( "itinerary2func", WEB_SITE_GLOBAL.'js/itinerary2func.js?1.00' );
+
+
 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/controller/InvoiceController.php

@@ -4938,7 +4938,7 @@ class InvoiceController extends DooController {
 				'accountPrice' => $detailM ['receivablesPrice'] 
 		);
 		$invoiceStatistics->setInvoiceStatisticsByCondition ( $item );
-		
+		//TODO 
 		// 公司流水记录
 		// Doo::loadModel ( 'wasteBook' );
 		// $wasteBook = new wasteBook ();

protected/controller/InvoiceExtendController.php

@@ -612,7 +612,7 @@ class InvoiceExtendController extends DooController {
 			die ( 'illegal request-emptyData' );
 		}
 		
-		if ( $invoiceDetail['untreadStatus']==2&&$invoiceDetail['status']==2&&$invoiceDetail['isDelete']==0&&$invoiceDetail['invalid']==0 ){
+		if ( $invoiceDetail['untreadStatus']==2&&$invoiceDetail['status']==2&&$invoiceDetail['invalid']==0 ){
 			$invoice = new invoice ();
 			$invoice->iid = $iid;
 			$invoice->invalid = 1;

protected/controller/ReceiptController.php

@@ -10993,6 +10993,12 @@ class ReceiptController extends DooController {
 				$receiptLog->status = 3;
 				$receiptLog->rid = $rid;
 				$receiptLog->insert ();
+				//删除行程单
+				Doo::loadModel ( 'itinerary' );
+				$itinerary = new itinerary ();
+				$itinerary->delete ( array (
+						'where' => 'rid="' . $rid . '"'
+				) );
 				
 				// 微信企业号通知
 				$this->setWXMsg ( $rid, 3 );
@@ -14269,6 +14275,9 @@ class ReceiptController extends DooController {
 		
 		$incomeList = $wasteBook->getAccountBookByExpensesType ( 0, 2, $con );
 		
+		print_r($incomeList);
+		
+		
 		$sum = 0;$thsDaySum=0;
 		foreach ( $incomeList as $key => $value ) {
 			$sum += $value ['accountPriceShow'];

protected/view/receipt/feeTravel.html

@@ -41,29 +41,27 @@
 									<input type="hidden" name="iid" id="iid" value="" />
 <input type="hidden" name="itinerary" id="itinerary" value="" />
 
-									<table class="table table-bordered table-condensed table-hover">
-
+									<table class="table table-bordered table-condensed table-hover"  >
 										<tr>
+											<td colspan="2">
+												<table width="100%" stroke>
+												
+												</table>
+											</td>
+										</tr>
+										
+										<!-- <tr>
 											<th colspan="2" class="taC">行程1#详细</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> -->
 
 
-									<strokeNode>
-									</strokeNode>
-
 									<tbody strokeNode >
 									</tbody>
 									
@@ -254,6 +252,7 @@
 					</div>
 					<div class="modal-body saeaList">
 						<input type="hidden" name="ediStrokeId" >
+						<input type="hidden" name="strokeIndex" id="strokeIndex" >
 						<table class="table table-bordered table-condensed">
 							<tr>
 								<th class="taC" colspan="4">出发-到达</th>
@@ -325,40 +324,18 @@
 
 		<script type="text/javascript">
 			autoFlashHeight();
-			var sessionStorageList='itineraryList';
+			var sessionStorageList='itineraryList2';
 		</script>
 		
-		<script src="<?= itinerary ?>"></script>
+		<!-- <script src="<?= itinerary ?>"></script>  -->
 		<script src="<?= itinerary2 ?>"></script>
+		<script src="<?= itinerary2func ?>"></script>
 		<script>
 		
 			
 			
 			$(function() {
 				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
 				//---------------------------
 				
 				$("input[id^='inttrain_']").change(function() {