发票旧数据导入相关功能

global/css/global.css

@@ -3742,3 +3742,10 @@ td div.dlLev3{
 .invoButton a.buttonUndone:active{
   background:#790000;
 }
+
+.colTip{
+	position:relative;
+  margin-left: 2px;
+  display:inline-block;
+  line-height: 19px;
+}

global/js/datepicker.zh.js

@@ -0,0 +1,12 @@
+;(function (jQuery) { jQuery.fn.datepicker.language['zh'] = {
+    days: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+    daysShort: ['日', '一', '二', '三', '四', '五', '六'],
+    daysMin: ['日', '一', '二', '三', '四', '五', '六'],
+    months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+    monthsShort: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+    today: '今天',
+    clear: '清除',
+    dateFormat: 'yyyy-mm-dd',
+    timeFormat: 'hh:ii',
+    firstDay: 0
+}; })(jQuery);

global/js/invoice.js

@@ -433,6 +433,11 @@ $(function() {
 					$("div[loading-msg='true']").html("");
 					$("#inKey").val(data.iidKey);
 					$("#irtc").html(data.html);
+					
+					$("input[name=receivablesPrice]").val(data.receivablesPrice);
+					$("input[name=receivablesMessage]").val(data.receivablesMessage);
+					$("input[name=receivablesDate]").val(data.receivablesDate);
+					
 				} else
 					$("div[loading-msg='true']").html("illegal request");
 			},

global/js/invoice.validator.js

@@ -64,7 +64,7 @@ $(function () {
 	    focusCleanup: true,
 	    theme:"yellow_top",
 	    fields: {
-	        'opinion': 'required; '
+	        //'opinion': 'required; '
 	    }
 	});
 	
@@ -105,11 +105,32 @@ $(function () {
 	    }
 	});
 	
+	//收款录入
 	$("form[name='receivablesInvoice']").validator({
 	    timely: 3,
 	    focusCleanup: true,
-	    fields: {
-	    	receivablesPrice: 'required; '
+	    fields: {//remote[/ajaxCheckInvoicePrice] 
+	    	receivablesPrice: 'required;'
+		    ,receivablesMessage: 'required; '
+			,receivablesBank: 'required '
+			,receivablesDate: 'required '
+			,receivablesCategory: 'required '
+			,receivablesStaff: 'required '
+	    }
+	});
+	
+	//入账
+	$("form[name='receivablesInvoiceBind']").validator({
+//		dataFilter: function(data) {
+//			console.log(data);
+//			return "ddd";
+////	        if (data.status === 200) return "2333";
+////	        else return data.msg;
+//	    },
+	    timely: 3,
+	    focusCleanup: true,
+	    fields: {//remote(/ajaxCheckInvoicePrice, iidKey:#inKey);
+	    	receivablesPrice: 'required;'
 		    ,receivablesMessage: 'required; '
 			,receivablesBank: 'required '
 			,receivablesDate: 'required '
@@ -118,6 +139,35 @@ $(function () {
 	    }
 	});
 	
+	$("input[checkInvoicePrice=true]").on('input',function(e){  
+		var inKey=$('#inKey').val();
+		var receivablesPrice=$(this).val();
+		var url = "/ajaxCheckInvoicePrice";
+ 		$.ajax({
+ 			url : url,
+ 			type : "post",
+ 			cache : false,
+ 			dataType : "json",
+ 			data : {
+ 				iidKey : inKey,
+ 				receivablesPrice:receivablesPrice
+ 			},
+ 			global : true,
+ 			success : function(data) {
+ 				
+ 				if(data!=null)
+ 					$('span[checkInvoicePrice=msg]').html(data.error);
+ 				else
+ 					$('span[checkInvoicePrice=msg]').html('');
+ 				
+ 				
+ 			},
+ 			error : function(err) {
+ 			}
+ 		});
+	});
+	
+	
 	$("form[name='receivablesAscription']").validator({
 	    timely: 3,
 	    focusCleanup: true,

global/js/notifications/notifications.js

@@ -0,0 +1,2 @@
+
+

protected/config/acl.conf.php

@@ -35,6 +35,12 @@ $acl ['ordinary'] ['allow'] = array (
 				//'ajaxReceivablesRemove'
 				//'invoiceEnterReceivables',
 				
+				'importInvoice',
+				'uploadInvoice',
+				'importInvoiceDo',
+				'importInvoiceReceivables',
+				'importInvoiceReceivablesDo'
+				
 		) 
 );
 
@@ -53,6 +59,7 @@ $acl ['收款管理'] ['allow'] = array (
 				'invoiceBindReceivables',
 				'invoiceAS',
 				'invoiceUnBundLing',
+				'ajaxCheckInvoicePrice',
 				'invoiceCompareClaimPrice'
 				
 		) 

protected/config/routes.conf.php

@@ -487,6 +487,7 @@ $route['post']['/invoiceUnBundLing'] = array('InvoiceController', 'invoiceUnBund
 $route['post']['/invoiceCompareClaimPrice'] = array('InvoiceController', 'invoiceCompareClaimPrice');
 $route['post']['/ajaxGetInvoiceReceivablesByIrid'] = array('InvoiceController', 'ajaxGetInvoiceReceivablesByIrid');
 $route['post']['/ajaxGetInvoiceReceivablesByTitle'] = array('InvoiceController', 'ajaxGetInvoiceReceivablesByTitle');
+$route['post']['/ajaxCheckInvoicePrice'] = array('InvoiceController', 'ajaxCheckInvoicePrice');
 
 
 //公司汇总查阅
@@ -494,6 +495,17 @@ $route['*']['/invoiceAggregate'] = array('InvoiceController', 'invoiceAggregate'
 $route['*']['/invoiceAggregateStaff'] = array('InvoiceController', 'invoiceAggregateStaff');
 $route['*']['/invoiceAggregateCategory/:cid'] = array('InvoiceController', 'invoiceAggregateCategory');
 
+
+
+//数据导入
+$route['*']['/importInvoice'] = array('InvoiceController', 'importInvoice');
+$route['*']['/uploadInvoice'] = array('InvoiceController', 'uploadInvoice');
+$route['*']['/importInvoiceDo'] = array('InvoiceController', 'importInvoiceDo');
+
+$route['*']['/importInvoiceReceivables'] = array('InvoiceController', 'importInvoiceReceivables');
+$route['*']['/importInvoiceReceivablesDo'] = array('InvoiceController', 'importInvoiceReceivablesDo');
+
+
 //假期管理
 $route['*']['/myList'] = array('HolidayController', 'myList');
 $route['*']['/myList/:yearnum'] = array('HolidayController', 'myList');

protected/controller/MainController.php

@@ -3631,12 +3631,25 @@ class MainController extends DooController {
 			Doo::loadModel ( 'company' );
 			$company = new company ();
 			
+			$cidList=explode(',', $cidString);
+			
+			foreach ($cidList as $value){
+				if(!is_numeric($value))
+					die ('illegal request3');
+			}
+			
+			
 			$companyInfo = $company->getOne ( array (
 					'where' => "cid = '" . $companyId . "'",
 					'asArray' => TRUE
 			) );
 			
 			$client->address=$companyInfo['address'];
+			$client->ride=$companyInfo['ride'];
+			$client->landmarks=$companyInfo['landmarks'];
+			$client->stay=$companyInfo['stay'];
+			$client->local=$companyInfo['local'];
+			$client->district=$companyInfo['district'];
 			
 			$falg=$client->update (array('where'=>'companyid ='.$companyInfo['cid'].' and cid in ('.$cidString.')'));
 			
@@ -4143,10 +4156,6 @@ class MainController extends DooController {
 
 					' . $u . '
 					
-<!--
-<script type="text/javascript" src="' . WEB_SITE_GLOBAL . 'js/bootstrap.min.js"></script>
-<script type="text/javascript" src="' . WEB_SITE_GLOBAL . 'js/bootstrap-datetimepicker.js" charset="UTF-8"></script>
-<script type="text/javascript" src="' . WEB_SITE_GLOBAL . 'js/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
 <script type="text/javascript">
    
 	$(".form_date").datetimepicker({
@@ -4162,7 +4171,7 @@ class MainController extends DooController {
     });
 	
 </script>
--->
+
 					
 	  	<script type="text/javascript">autoFlashHeight();</script>	</div>' 
 		);

protected/model/invoice.php

@@ -282,6 +282,17 @@ class invoice extends DooModel {
 		return $Detail;
 	}
 	
+	function getInvoiceByInvoiceNo($invoiceNo=''){
+		if (empty ( $invoiceNo ) )
+			return array ();
+		$detail = $this->getOne ( array (
+				'where' => "invoiceNo= '" . $invoiceNo . "'", 
+				'asArray' => TRUE
+		) );
+		
+		return $detail;
+	}
+	
 	/**
 	 * 根据标题或者开票单位获得相关信息 - 准确查询
 	 * @param string $title 查询条件
@@ -460,8 +471,9 @@ class invoice extends DooModel {
 	/**
 	 * 获得所有未入账发票
 	 * @param number $invoiceTC 发票title
+	 * 
 	 */
-	public function getInvoiceByUnAccount($invoiceTC='') {
+	public function getInvoiceByUnAccount($invoiceTC='',$iridExist=false) {
 		Doo::loadClass ( 'XDeode' );
 		$XDeode = new XDeode ( 5 );
 		
@@ -469,9 +481,14 @@ class invoice extends DooModel {
 		if (!empty($invoiceTC))
 			$title=' and (invoiceTitle like "%'.$invoiceTC.'%" or invoiceCompany like "%'.$invoiceTC.'%" )';
 		
-		$list = $this->find ( array (//and irid=''
-				'where' => "status=2 and printStatus=1 and untreadStatus=0  and ( (doPost=1 and postStatus=1) or doPost=0 ) and isDelete=0 ".$title,
+		$iridString=' and irid="" ';	
+		if ($iridExist)
+			$iridString=' and irid!="" ';
+		
+		$list = $this->find ( array (//
+				'where' => "status=2 and printStatus=1 ".$iridString." and  untreadStatus=0  and ( (doPost=1 and postStatus=1) or doPost=0 ) and isDelete=0 ".$title,
 				'desc' => 'iid',
+				'limit'=>5,
 				'asArray' => TRUE 
 		));
 		foreach ( $list as $key => $value ) {
@@ -495,7 +512,7 @@ class invoice extends DooModel {
 		foreach ( $list ['handleInvoice'] as $key => $value ) {
 			$list ['handleInvoice'] [$key] ['iidKey'] = $this->authcode ( $value ['iid'], '' );
 			$list ['handleInvoice'] [$key] ['iidKeyUrl'] = $XDeode->encode ( $value ['iid'] );
-			// $list ['handleInvoice'] [$key] ['OperationLog'] = $invoiceOperationLog->getInvoiceOperationLogByIid ( $value ['iid'], 'desc' );
+			//$list ['handleInvoice'] [$key] ['OperationLog'] = $invoiceOperationLog->getInvoiceOperationLogByIid ( $value ['iid'], 'desc' );
 		}
 		return $list ['handleInvoice'];
 	}
@@ -575,7 +592,7 @@ class invoice extends DooModel {
 		Doo::loadClass ( 'XDeode' );
 		$XDeode = new XDeode ( 5 );
 		$list = $this->find ( array (
-				'where' => " (status=1 or status=3 or status=4) and processApprovals!=''",
+				'where' => " (status=1 or status=2 or status=3 or status=4) and processApprovals!=''",
 				'limit' => $limit,
 				$desc => 'iid',
 				'asArray' => TRUE 

protected/model/invoiceReceivables.php

@@ -30,6 +30,7 @@ class invoiceReceivables extends DooModel {
 	public $bindDate;
 	public $unbundlingTime;
 	public $accountClerk;
+	public $sourcePrice;
 	public $_table = 'CLD_invoiceReceivables';
 	public $_primarykey = 'irid';
 	public $_fields = array (
@@ -53,7 +54,8 @@ class invoiceReceivables extends DooModel {
 			'confirmTime',
 			'bindDate',
 			'unbundlingTime',
-			'accountClerk' 
+			'accountClerk' ,
+			'sourcePrice'
 	);
 	public function getSumOfReceivablesPrice($iridString = "") {
 		if (empty ( $iridString ))
@@ -65,7 +67,7 @@ class invoiceReceivables extends DooModel {
 				'groupby' => 'iid',
 				'asArray' => TRUE 
 		) );
-		
+		echo $list ['receivablesPrice'].'sdsdf';
 		if (empty ( $list ))
 			return 0;
 		return $list ['receivablesPrice'];

protected/model/staff.php

@@ -50,6 +50,15 @@ class staff extends DooModel {
 				'asArray' => TRUE 
 		) );
 	}
+	
+	public function getStaffByName($username=''){
+		return $this->getOne ( array (
+				'asc' => 'sid',
+				'where' => "username= '" . $username . "'",
+				'asArray' => TRUE
+		) );
+	}
+	
 	public function getStaff() {
 		return $this->find ( array (
 				'desc' => 'sid',

protected/view/admin/invoiceAS.html

@@ -0,0 +1,212 @@
+<!-- include '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/invoice.validator.js"></script>
+<script src="<?= WEB_SITE_GLOBAL ?>js/invoice.js"></script>
+<link href="<?= WEB_SITE_GLOBAL ?>css/datepicker.min.css" rel="stylesheet" type="text/css">
+<script src="<?= WEB_SITE_GLOBAL ?>js/datepicker.min.js"></script>
+<script src="<?= WEB_SITE_GLOBAL ?>js/datepicker.zh.js"></script>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<!-- include 'menuReceipt' -->
+				</ul>
+			</div>
+			
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<!-- include 'invoiceMenu' -->
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<legend>
+					发票管理 <a href="/invoiceReceivablesAS">收款管理</a>
+				</legend>
+				<div class="demandCate">
+				<form action="/invoiceAS/1/{{status}}" id="iras" method="get">
+					<ul class="cateList">
+	  					<li>  
+	  					<a <!-- if {{status}}=='All' --> class="now" <!-- endif -->  href="/invoiceAS">所有</a>
+	  					<a <!-- if {{status}}=='UNRECORD' --> class="now" <!-- endif --> href="/invoiceAS/1/UNRECORD" title="未入账">未入账</a>
+	  					<a <!-- if {{status}}=='RECORD' --> class="now" <!-- endif --> href="/invoiceAS/1/RECORD" title="已入账">已入账</a>
+	  					<a <!-- if {{status}}=='BOUNCED' --> class="now" <!-- endif --> href="/invoiceAS/1/BOUNCED" title="已退票">已退票</a>
+	  					</li>
+							<li>
+								<div class="search">
+									<div class="input-append">
+										<input class="datepicker-here span3" name="date" value="{{date}}" placeholder="按出票时间筛选" data-range="true" 
+										data-multiple-dates-separator=" : " data-language="zh" type="text">
+										<button class="btn btn-small" type="submit">查询</button>
+									</div>
+								</div>
+							</li>
+							<li><div class="search"><div class="input-append">
+									<input class="span3" placeholder="开票单位" name="MebSea" value="{{MebSeaEn}}" type="text">
+									<button class="btn btn-small" node-irmMebSea type="submit">搜索</button>
+								</div>
+							</div></li>
+					</ul>
+				</form>
+	  		</div>
+				<div class="saeaList">
+					<table class="table table-hover">
+						<tbody>
+						<tr class="thead"><th>开票流水号</th><th>开票金额</th><th>开票单位（抬头）</th><th>开票内容</th><th>出票时间</th><th>收款流水号</th><th>收款金额</th><th>操作</th></tr>
+						<!-- loop list -->
+						<tr>
+							<td><a href="#invdetail" node-invoice='INFO' data-isKey="{{list' value.iidKeyK}}" data-toggle="modal">{{list' value.invoiceSerial}}</a></td>
+							<td>
+								<!-- if !empty({{list' value.invoiceType}}) -->
+	                        	<b>￥{{list' value.invoicePrice}}</b><sup>专</sup>
+	                          <!-- else -->
+	                          <b>￥{{list' value.invoicePrice}}</b>
+	                          <!-- endif -->
+							</td>
+							<td>
+								<!-- if !empty({{list' value.invoiceType}}) -->
+	                                   	{{list' value.invoiceCompany}}
+	                                    <!-- else -->
+	                                    {{list' value.invoiceTitle}}
+	                                    <!-- endif -->
+							</td>
+							<td>{{list' value.invoiceElement}}</td>
+							<td>
+							{{list' value.printTime}}
+							</td>
+							<td>
+							<!-- loop list' value.irList -->
+							<a href="#billing" node-invoice='INFO' data-type="receivables" data-isKey="{{list' value' value.iridKeyK}}" data-toggle="modal">{{list' value' value.receivablesSerial}}</a>&nbsp;
+							<!-- endloop -->
+							</td>
+							<td>
+							<!-- if {{list' value.sumPrice}}==0 -->
+							<!-- elseif {{list' value.sumPrice}}=={{list' value.invoicePrice}} -->
+							<b >￥{{list' value.sumPrice}}</b>
+							<!-- elseif {{list' value.sumPrice}}>{{list' value.invoicePrice}} -->
+							<b class="colOrange">￥{{list' value.sumPrice}}</b>
+							<!-- elseif {{list' value.sumPrice}}<{{list' value.invoicePrice}} -->
+							<b class="colRed">￥{{list' value.sumPrice}}</b>
+							<!-- endif -->
+							
+							</td>
+							<td>
+							<!-- if {{list' value.sumPrice}}<{{list' value.invoicePrice}}||{{list' value.sumPrice}}==0 -->
+							<a href="#recorded" node-invoiceReceivables='INFO' data-isKey="{{list' value.iidKeyK}}" data-toggle="modal">入账</a>
+							<!-- endif -->
+							</td>
+						</tr>
+						<!-- endloop -->
+						
+						
+						
+						</tbody>
+					</table>
+				</div>
+				<!--翻页-->
+				<div class="demandPage">
+					<ul class="pagination fL">
+	  							<!-- if {{page.previous}}==0 -->
+								<li><a href="javascript:void(0)" title="上一页">&lt;</a></li>
+								<!-- else -->
+								<li><a href="/invoiceAS/{{page.previous}}{{get}}" title="上一页">&lt;</a></li>
+								<!-- endif -->	
+								
+	  							<!-- if {{page.on_page}}>=3 -->
+	  							<li><a href="/invoiceAS/1{{get}}" title="上一页">1</a></li>
+	  							<li class="point"><span>...</span></li>
+	  							<!-- endif -->
+	  							{{page.page}}
+	  							<!-- if {{page.on_page}}<3 && {{page.total_page}}>5 -->
+	  							<li><a href="/invoiceAS/4{{get}}" >4</a></li>
+	  							<li><a href="/invoiceAS/5{{get}}" >5</a></li>
+	  							<!-- endif -->
+	  							
+	  							<!-- if {{page.total_page}}>3 -->
+	  							<li class="point"><span>...</span></li>
+			  					<!-- endif -->
+			  					
+			  					<!-- if {{page.next}}=={{page.on_page}} -->
+								<li><a href="javascript:void(0)" title="下一页">&gt;</a></li>
+								<!-- else -->
+								<li><a href="/invoiceAS/{{page.next}}{{get}}" title="下一页">&gt;</a></li>
+								<!-- endif -->
+			  					
+			  		</ul>
+			  	</div>		
+			  	
+			  	
+			  	
+			</div>
+		</div>
+	</div>
+	<!--弹出（发票入账）-->
+	<div class="modal hide fade" id="recorded">
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
+		
+		<form action="/invoiceCompareClaimPrice" method="post" name="receivablesInvoice">
+			<input type="hidden" name="iidKey" id="inKey" value="">
+			<div class="modal-header">
+				<h3>发票入账</h3>
+			</div>
+			<div class="modal-body saeaList">
+			
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" colspan="4">收款信息填写</th>
+					</tr>
+					<tr>
+						<th class="taC">收款金额</th><td><input checkInvoicePrice=true  name="receivablesPrice" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number">
+						<span class="colRed colTip"><span style="position:absolute;z-index=1;width:150px;top:-12px"  checkInvoicePrice=msg></span></span></td>
+					</tr>
+					<tr>
+						<th class="taC">收款信息</th><td><input type="text" name="receivablesMessage"  ></td>
+					</tr>
+					<tr>
+						<th class="taC">收款银行</th><td>
+						<select name="receivablesBank">
+								<option value="公司广发">公司广发</option>
+								<option value="其他">其他</option>
+							</select>
+							</td>
+					</tr>
+					<tr>
+						<th class="taC">银行到帐时间</th><td><input name="receivablesDate"  type="date"></td>
+					</tr>
+					</tbody>
+				</table>
+				
+				<div id="irtc"></div>
+			</div>
+			<div class="modal-footer">
+				<input type="submit" class="button"  value="确认入账">
+				
+				<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+			</div>
+		</form>
+		</div>
+	</div>
+</div>
+	
+	
+	
+	
+	<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>
+<script type="text/javascript">autoFlashHeight();</script>
+</body>

protected/view/admin/invoiceApproval.html

@@ -77,7 +77,6 @@
 	                                    <!-- else -->
 	                                    {{ilist' value.invoiceTitle}}
 	                                    <!-- endif -->
-										
 									</td>
                                     <td>
 									<!-- if !empty({{ilist' value.invoiceType}}) -->

protected/view/admin/invoiceImport.html

@@ -0,0 +1,158 @@
+<!-- include 'header' -->
+<script src="<?= WEB_SITE_GLOBAL ?>js/example.js"></script>
+<script src="<?= WEB_SITE_GLOBAL ?>js/SWFUpload/mmSWFUpload.js"></script>
+<style type="text/css">
+		
+		body, pre {
+			font-family: "Trebuchet MS", Arial, Sans-serif;
+		}
+
+		h1 {
+			background: url(images/common/big_logo.png) no-repeat;
+			width: 458px;
+			height: 206px;
+		}
+
+		h1 span {
+			display: none;
+		}
+
+		h2 {
+			font-size: 20px;
+			font-weight: normal;
+		}
+
+		p, li, pre {
+			font-size: 14px;
+		}
+
+		pre {
+			color: #666666;
+		}
+
+		li {
+			cl2ear: both;
+		}
+
+		#wrapper {
+			width: 500px;
+			margin: 0 auto;
+		}
+		
+		#content {
+			padding: 0 0 0 20px;
+		}
+		
+		.clr {
+			clear: both;
+		}
+		
+		/* SWFUpload CSS */
+		
+		#filesDisplay {
+			padding: 10px;
+			margin-top: 20px;
+			background: #f9f9f9;
+			border: 1px solid #f3f3f3;
+			display: none;
+		}
+		
+		#SWFUpload {
+			margin-left: 20px;
+		}
+		
+		#mmUploadFileListing {
+			margin: 0;
+			padding: 0;
+		}
+		
+		#mmUploadFileListing li {
+			margin: 0 0 10px 0;
+			display: block;
+			float: left;
+			width: 150px;
+			list-style-type: none;
+			font-size: 11px;
+		}
+		
+		.uploading { color: #CCC; }
+		.uploadDone { color: #000; }
+		
+		span.progressBar {
+			width: 100px;
+			background: #000;
+			display: block;
+			font-size: 10px;
+			height: 4px;
+			margin-top: 4px;
+		}
+
+	</style>
+	
+	
+<body>
+
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="contactTab">
+				
+				<form class="" action="/searchlongle" method="post">
+				
+				<div class="searchItem"><input type="text" name="search" placeholder="输入锁号进行搜索"><input type="submit" value="搜索" class="subBtn"><input value="新锁" class="subBtn add" type="button" onclick="javascrtpt:window.location.href='/adminlock'"></div>
+				
+				</form>
+			</div>	
+			<div class="adminContent autoHeight">
+			    <form name="lock" action="/importInvoiceDo" method="post">
+		            <legend>导入发票数据</legend>
+					    <div class="control-group">
+			              <label for="inputEmail" class="control-label">上传Excel</label>
+			              <div class="controls">
+			                	<div id="SWFUpload">You need a newer version of flash</div>
+			
+			<script type="text/javascript">
+
+				mmSWFUpload.init({
+					// debug : true,
+					upload_backend : "/uploadInvoice",
+					button_image : "/global/images/btn-normal.gif",
+					button_mouseover_image : "/global/images/btn-hover.gif",
+					width : "200px",
+					height : "50px",
+					target : "SWFUpload",
+					allowed_filetypes : "*.xlsx",
+					upload_start_callback : 'uploadStart',
+					upload_progress_callback : 'uploadProgress',
+					upload_complete_callback : 'uploadComplete',
+					// upload_error_callback : 'uploadError',
+					upload_cancel_callback : 'uploadCancel'
+				});
+			
+				
+			</script>
+			
+			<div id="filesDisplay">
+				<ul id="mmUploadFileListing"></ul>
+				<br class="clr" />
+				<input type="hidden" name="path" id="path" value=""></input>
+			</div>
+			              </div>
+			            </div>
+			            
+			            <div class="control-group">
+			              <div class="controls">
+			              	<div>{{emsg}}</div>
+					   		 <input type="submit" class="button" value="提交"></input>
+			              </div>
+			            </div>
+			    </form>
+			</div>
+		</div>
+	</div>
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/view/admin/invoiceMyUnAccountAchieve.html

@@ -0,0 +1,128 @@
+<!-- include '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/invoice.validator.js"></script>
+<link href="<?= WEB_SITE_GLOBAL ?>css/datepicker.min.css" rel="stylesheet" type="text/css">
+<script src="<?= WEB_SITE_GLOBAL ?>js/datepicker.min.js"></script>
+<script src="<?= WEB_SITE_GLOBAL ?>js/datepicker.zh.js"></script>
+<script src="<?= WEB_SITE_GLOBAL ?>js/invoice.js"></script>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<!-- include 'menuReceipt' -->
+				</ul>
+			</div>
+			
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<!-- include 'invoiceMenu' -->
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<legend>
+				待入账发票</legend>
+				<div class="demandCate">
+				<form action="/invoiceMyUnAccountAchieve/1" id="ira" method="get" >
+					<ul class="cateList">
+						<li>
+							<div class="search">
+								<div class="input-append">
+									<input class="datepicker-here span3" name="date" value="{{date}}" placeholder="按时间筛选" type="text" data-range="true"
+							    data-multiple-dates-separator=" : "
+							    data-language="zh">
+									<button class="btn btn-small" type="submit">查询</button>
+								</div>
+							</div></li>						<li>
+							<div class="search">
+							<div class="input-append">
+								<input class="span3" type="text" name="MebSea" value="{{MebSeaEn}}" placeholder="发票抬头、开票金额">
+								<button class="btn btn-small" type="submit">搜索</button>
+							</div>
+						</li>
+	  			</ul>
+	  			</form>
+	  		</div>
+				<div class="saeaList">
+					<table class="table table-hover">
+						<tbody>
+						<tr class="thead"><th>开票流水号</th><th>开票金额</th><th>开票单位（抬头）</th><th>开票内容</th>
+						<th>出票时间</th></tr>
+						<!-- loop list -->
+						<tr>
+							<td><a href="#invdetail" node-invoice='INFO' data-isKey="{{pendingInvoice' value.iidKeyK}}"  data-toggle="modal">{{list' value.invoiceSerial}}</a></td>
+							<td>
+							<!-- if !empty({{list' value.invoiceType}}) -->
+	                        <b>￥{{list' value.invoicePrice}}</b><sup>专</sup>
+	                          <!-- else -->
+	                          <b>￥{{list' value.invoicePrice}}</b>
+	                          <!-- endif -->
+							</td>
+							<td>
+							<!-- if !empty({{list' value.invoiceType}}) -->
+	                                   	{{list' value.invoiceCompany}}
+	                                    <!-- else -->
+	                                    {{list' value.invoiceTitle}}
+	                                    <!-- endif -->
+							</td>
+							<td>{{list' value.invoiceElement}}</td>
+							
+							<td>{{list' value.printTime}}</td>
+						</tr>
+						<!-- endloop -->
+						
+						</tbody>
+					</table>
+				</div>
+						  		<!--翻页-->
+				<div class="demandPage">
+					<ul class="pagination fL">
+	  							<!-- if {{page.previous}}==0 -->
+								<li><a href="javascript:void(0)" title="上一页">&lt;</a></li>
+								<!-- else -->
+								<li><a href="/invoiceMyUnAccountAchieve/{{page.previous}}{{get}}" title="上一页">&lt;</a></li>
+								<!-- endif -->	
+								
+	  							<!-- if {{page.on_page}}>=3 -->
+	  							<li><a href="/invoiceMyUnAccountAchieve/1{{get}}" title="上一页">1</a></li>
+	  							<li class="point"><span>...</span></li>
+	  							<!-- endif -->
+	  							{{page.page}}
+	  							<!-- if {{page.on_page}}<3 && {{page.total_page}}>5 -->
+	  							<li><a href="/invoiceMyUnAccountAchieve/4{{get}}" >4</a></li>
+	  							<li><a href="/invoiceMyUnAccountAchieve/5{{get}}" >5</a></li>
+	  							<!-- endif -->
+	  							
+	  							<!-- if {{page.total_page}}>3 -->
+	  							<li class="point"><span>...</span></li>
+			  					<!-- endif -->
+			  					
+			  					<!-- if {{page.next}}=={{page.on_page}} -->
+								<li><a href="javascript:void(0)" title="下一页">&gt;</a></li>
+								<!-- else -->
+								<li><a href="/invoiceMyUnAccountAchieve/{{page.next}}{{get}}" title="下一页">&gt;</a></li>
+								<!-- endif -->
+			  		</ul>
+			  	</div>				
+			</div>
+		</div>
+	</div>
+	
+	
+	<div class="modal  fade" id="billing">
+		<div id="nr"></div>
+	</div>
+	
+	
+	<div loading-msg='true' style="position:absolute;  left:50%;  top:50%;  "></div>
+	<div class="modal  fade" id="invdetail">
+		<div id="nc"></div>
+	</div>
+	
+<script type="text/javascript">autoFlashHeight();</script>
+</body>

protected/view/admin/invoiceReceivables.html

@@ -127,7 +127,7 @@
 					
 						<div class="clearfix">
 							
-							<legend><div class="fR"><a href="/invoiceReceivablesAS">查看更多</a></div>最近入账</legend>
+							<legend>最近入账</legend>
 							<!-- if !empty({{receivablesList}}) -->
 							<table class="table table-bordered table-condensed">
 								<tbody>
@@ -156,6 +156,58 @@
 							<blockquote><p class="colGray">暂时没有最近入账</p></blockquote>
 							<!-- endif -->
 						</div>
+						
+						<div class="clearfix">
+							<legend><div class="fR"><a href="/invoiceAS">查看所有</a></div>部分入账发票（{{ieaCount}}）</legend>
+							
+							<!-- if !empty({{invoiceExistAccount}}) -->
+							<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>
+								
+								<!-- loop invoiceExistAccount -->
+									<tr>
+									<td>
+									<!-- if !empty({{invoiceUnAccount' value.invoiceType}}) -->
+	                                   	{{invoiceUnAccount' value.invoiceCompany}}
+	                                    <!-- else -->
+	                                    {{invoiceUnAccount' value.invoiceTitle}}
+	                                    <!-- endif -->
+									</td>
+									<td>
+										<!-- if !empty({{invoiceUnAccount' value.invoiceType}}) -->
+	                                    <b>￥{{invoiceUnAccount' value.invoicePrice}}</b><sup>专</sup>
+	                                    <!-- else -->
+	                                    <b>￥{{invoiceUnAccount' value.invoicePrice}}</b>
+	                                    <!-- endif -->
+									</td>
+									<td>{{invoiceUnAccount' value.categoryName}}{{invoiceUnAccount' value.userName}} {{invoiceUnAccount' value.date}}</td>
+									
+									<td>{{invoiceUnAccount' value.existAccount}}</td>
+									<td>{{invoiceUnAccount' value.balance}}</td>
+									
+									<td>
+									<a href="#invdetail" node-invoice='INFO' data-isKey="{{invoiceUnAccount' value.iidKeyUrl}}" data-toggle="modal">{{invoiceUnAccount' value.invoiceSerial}}</a>
+									</td>
+									<td>
+									<a class="button btn-block" href="#recorded" node-invoiceReceivables='INFO' data-isKey="{{invoiceUnAccount' value.iidKeyUrl}}" data-toggle="modal">入账</a>
+									</td>
+									</tr>
+								
+								<!-- endloop -->
+									
+									
+								</tbody>
+							</table>
+								<!-- else -->
+							<blockquote><p class="colGray">暂时没有部分入账发票</p></blockquote>
+							<!-- endif -->
+						</div>
+						
+						
 					</div>
 				</div>
 			</div>
@@ -173,7 +225,7 @@
 	<div class="modal-dialog modal-lg">
 		<div class="modal-content">
 		
-		<form action="/invoiceCompareClaimPrice" method="post" name="receivablesInvoice">
+		<form action="/invoiceCompareClaimPrice" method="post" name="receivablesInvoiceBind">
 			<input type="hidden" name="iidKey" id="inKey" value="">
 			<div class="modal-header">
 				<h3>发票入账</h3>
@@ -186,7 +238,9 @@
 						<th class="taC" colspan="4">收款信息填写</th>
 					</tr>
 					<tr>
-						<th class="taC">收款金额</th><td><input  name="receivablesPrice" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+						<th class="taC">收款金额</th>
+						<td><input  name="receivablesPrice" checkInvoicePrice=true placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number">
+						<span class="colRed colTip"><span style="position:absolute;z-index=1;width:150px;top:-12px"  checkInvoicePrice=msg></span></span></td>
 					</tr>
 					<tr>
 						<th class="taC">收款信息</th><td><input type="text" name="receivablesMessage"  ></td>
@@ -194,7 +248,8 @@
 					<tr>
 						<th class="taC">收款银行</th><td>
 						<select name="receivablesBank">
-								<option>广发银行珠海分行柠溪支行</option>
+								<option value="公司广发">公司广发</option>
+								<option value="其他">其他</option>
 							</select>
 							</td>
 					</tr>
@@ -204,6 +259,8 @@
 					</tbody>
 				</table>
 				
+				
+				
 				<div id="irtc"></div>
 			</div>
 			<div class="modal-footer">
@@ -249,13 +306,14 @@
 						<tr>
 							<th class="taC">收款银行</th><td>
 							<select name="receivablesBank">
-								<option>广发银行珠海分行柠溪支行</option>
+								<option value="公司广发">公司广发</option>
+								<option value="其他">其他</option>
 							</select>
 							</td>
 						</tr>
 						<tr>
 							<th class="taC">银行到帐时间</th>
-							<td><input name="receivablesDate" type="date"></td>
+							<td><input name="receivablesDate" value='{{receivablesDate}}' type="date"></td>
 						</tr>
 						<tr>
 							<th class="taC">认领收款</th><td colspan="3">

protected/view/admin/invoiceReceivablesImport.html

@@ -0,0 +1,158 @@
+<!-- include 'header' -->
+<script src="<?= WEB_SITE_GLOBAL ?>js/example.js"></script>
+<script src="<?= WEB_SITE_GLOBAL ?>js/SWFUpload/mmSWFUpload.js"></script>
+<style type="text/css">
+		
+		body, pre {
+			font-family: "Trebuchet MS", Arial, Sans-serif;
+		}
+
+		h1 {
+			background: url(images/common/big_logo.png) no-repeat;
+			width: 458px;
+			height: 206px;
+		}
+
+		h1 span {
+			display: none;
+		}
+
+		h2 {
+			font-size: 20px;
+			font-weight: normal;
+		}
+
+		p, li, pre {
+			font-size: 14px;
+		}
+
+		pre {
+			color: #666666;
+		}
+
+		li {
+			cl2ear: both;
+		}
+
+		#wrapper {
+			width: 500px;
+			margin: 0 auto;
+		}
+		
+		#content {
+			padding: 0 0 0 20px;
+		}
+		
+		.clr {
+			clear: both;
+		}
+		
+		/* SWFUpload CSS */
+		
+		#filesDisplay {
+			padding: 10px;
+			margin-top: 20px;
+			background: #f9f9f9;
+			border: 1px solid #f3f3f3;
+			display: none;
+		}
+		
+		#SWFUpload {
+			margin-left: 20px;
+		}
+		
+		#mmUploadFileListing {
+			margin: 0;
+			padding: 0;
+		}
+		
+		#mmUploadFileListing li {
+			margin: 0 0 10px 0;
+			display: block;
+			float: left;
+			width: 150px;
+			list-style-type: none;
+			font-size: 11px;
+		}
+		
+		.uploading { color: #CCC; }
+		.uploadDone { color: #000; }
+		
+		span.progressBar {
+			width: 100px;
+			background: #000;
+			display: block;
+			font-size: 10px;
+			height: 4px;
+			margin-top: 4px;
+		}
+
+	</style>
+	
+	
+<body>
+
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="contactTab">
+				
+				<form class="" action="/searchlongle" method="post">
+				
+				<div class="searchItem"><input type="text" name="search" placeholder="输入锁号进行搜索"><input type="submit" value="搜索" class="subBtn"><input value="新锁" class="subBtn add" type="button" onclick="javascrtpt:window.location.href='/adminlock'"></div>
+				
+				</form>
+			</div>	
+			<div class="adminContent autoHeight">
+			    <form name="lock" action="/importInvoiceReceivablesDo" method="post">
+		            <legend>导入入账数据</legend>
+					    <div class="control-group">
+			              <label for="inputEmail" class="control-label">上传Excel</label>
+			              <div class="controls">
+			                	<div id="SWFUpload">You need a newer version of flash</div>
+			
+			<script type="text/javascript">
+
+				mmSWFUpload.init({
+					// debug : true,
+					upload_backend : "/uploadInvoice",
+					button_image : "/global/images/btn-normal.gif",
+					button_mouseover_image : "/global/images/btn-hover.gif",
+					width : "200px",
+					height : "50px",
+					target : "SWFUpload",
+					allowed_filetypes : "*.xlsx",
+					upload_start_callback : 'uploadStart',
+					upload_progress_callback : 'uploadProgress',
+					upload_complete_callback : 'uploadComplete',
+					// upload_error_callback : 'uploadError',
+					upload_cancel_callback : 'uploadCancel'
+				});
+			
+				
+			</script>
+			
+			<div id="filesDisplay">
+				<ul id="mmUploadFileListing"></ul>
+				<br class="clr" />
+				<input type="hidden" name="path" id="path" value=""></input>
+			</div>
+			              </div>
+			            </div>
+			            
+			            <div class="control-group">
+			              <div class="controls">
+			              	<div>{{emsg}}</div>
+					   		 <input type="submit" class="button" value="提交"></input>
+			              </div>
+			            </div>
+			    </form>
+			</div>
+		</div>
+	</div>
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/view/admin/invoiceUntreadIsAchieve.html

@@ -0,0 +1,211 @@
+<!-- include '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/invoice.validator.js"></script>
+<link href="<?= WEB_SITE_GLOBAL ?>css/datepicker.min.css" rel="stylesheet" type="text/css">
+<script src="<?= WEB_SITE_GLOBAL ?>js/datepicker.min.js"></script>
+<script src="<?= WEB_SITE_GLOBAL ?>js/datepicker.zh.js"></script>
+<script src="<?= WEB_SITE_GLOBAL ?>js/invoice.js"></script>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<!-- include 'menuReceipt' -->
+				</ul>
+			</div>
+			
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<!-- include 'invoiceMenu' -->
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<legend>
+				可退票发票</legend>
+				<div class="demandCate">
+				<form action="/invoiceUntreadIsAchieve/1" id="ira" method="get" >
+					<ul class="cateList">
+						<li>
+							<div class="search">
+								<div class="input-append">
+									<input class="datepicker-here span3" name="date" value="{{date}}" placeholder="按时间筛选" type="text" data-range="true"
+							    data-multiple-dates-separator=" : "
+							    data-language="zh">
+									<button class="btn btn-small" type="submit">查询</button>
+								</div>
+							</div></li>						<li>
+							<div class="search">
+							<div class="input-append">
+								<input class="span3" type="text" name="MebSea" value="{{MebSeaEn}}" placeholder="发票抬头、开票金额">
+								<button class="btn btn-small" type="submit">搜索</button>
+							</div>
+						</li>
+	  			</ul>
+	  			</form>
+	  		</div>
+				<div class="saeaList">
+					<table class="table table-hover">
+						<tbody>
+						<tr class="thead"><th>开票流水号</th><th>开票金额</th><th>开票单位（抬头）</th><th>开票内容</th><th>收款流水号</th><th>收款金额</th><th>入账时间</th><th>申请退票</th></tr>
+						<!-- loop list -->
+						<tr>
+							<td><a href="#invdetail" node-invoice='INFO' data-isKey="{{pendingInvoice' value.iidKeyK}}"  data-toggle="modal">{{list' value.invoiceSerial}}</a></td>
+							<td>
+							<!-- if !empty({{list' value.invoiceType}}) -->
+	                        <b>￥{{list' value.invoicePrice}}</b><sup>专</sup>
+	                          <!-- else -->
+	                          <b>￥{{list' value.invoicePrice}}</b>
+	                          <!-- endif -->
+							</td>
+							<td>
+							<!-- if !empty({{list' value.invoiceType}}) -->
+	                                   	{{list' value.invoiceCompany}}
+	                                    <!-- else -->
+	                                    {{list' value.invoiceTitle}}
+	                                    <!-- endif -->
+							</td>
+							<td>{{list' value.invoiceElement}}</td>
+							<!-- if empty({{list' value.irList}}) -->
+							<td></td>
+							<td></td>
+							<td></td>
+							<!-- else -->
+							<td><a href="#billing" node-invoice='INFO' data-type="receivables" data-isKey="{{list' value.irList.0.iridKeyK}}" data-toggle="modal">{{list' value.irList.0.receivablesSerial}}</a></td>
+							<td>{{list' value.irList.0.receivablesPrice}}</td>
+							<td>{{list' value.irList.0.confirmTime}}</td>
+							<!-- endif -->
+							<td><a diss-data="{{list' value.iidKey}}" node-invoice="untreadInvoice" href="#return" data-toggle="modal">申请退票</a></td>
+						</tr>
+						<!-- endloop -->
+						
+						</tbody>
+					</table>
+				</div>
+						  		<!--翻页-->
+				<div class="demandPage">
+					<ul class="pagination fL">
+	  							<!-- if {{page.previous}}==0 -->
+								<li><a href="javascript:void(0)" title="上一页">&lt;</a></li>
+								<!-- else -->
+								<li><a href="/invoiceUntreadIsAchieve/{{page.previous}}{{get}}" title="上一页">&lt;</a></li>
+								<!-- endif -->	
+								
+	  							<!-- if {{page.on_page}}>=3 -->
+	  							<li><a href="/invoiceUntreadIsAchieve/1{{get}}" title="上一页">1</a></li>
+	  							<li class="point"><span>...</span></li>
+	  							<!-- endif -->
+	  							
+	  							{{page.page}}
+	  							
+	  							<!-- if {{page.on_page}}<3 && {{page.total_page}}>5 -->
+	  							<li><a href="/invoiceUntreadIsAchieve/4{{get}}" >4</a></li>
+	  							<li><a href="/invoiceUntreadIsAchieve/5{{get}}" >5</a></li>
+	  							<!-- endif -->
+	  							
+	  							<!-- if {{page.total_page}}>3 -->
+	  							<li class="point"><span>...</span></li>
+			  					<!-- endif -->
+			  					
+			  					<!-- if {{page.next}}=={{page.on_page}} -->
+								<li><a href="javascript:void(0)" title="下一页">&gt;</a></li>
+								<!-- else -->
+								<li><a href="/invoiceUntreadIsAchieve/{{page.next}}{{get}}" title="下一页">&gt;</a></li>
+								<!-- endif -->
+			  		</ul>
+			  	</div>				
+			  	
+			  	
+			</div>
+		</div>
+	</div>
+	<!--弹出 退票-->
+	
+	
+	
+	
+	<div class="modal hide fade" id="return">
+	<form action="/invoiceUntreadDo" method="post" name="untreadInvoice">
+	<input type="hidden" name='untreadIidKey' value="">
+		<div class="modal-dialog ">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>申请退票</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th class="taC"><span class="colRed">*</span>退票原因</th>
+							<td>
+							<textarea class="span4" name="untreadReason" placeholder="请详细填写退票原因"></textarea>
+							</td>
+						</tr>
+						<tr>
+							<th class="taC"><span class="colRed">*</span>是否邮寄</th>
+							<td><label class="radio inline"><input name="untreadPost" node-untread='post' value="1" checked type="radio">是</label>
+							<label class="radio inline"><input name="untreadPost" value="0" type="radio">否</label>
+							</td>
+						</tr>
+						</tbody>
+					</table>
+					
+					<!-- 待删除
+					<table post-box='ture' class="table table-bordered table-condensed hide">
+						<tbody>
+						<tr>
+							<th colspan="2" class="taC">退票邮寄信息</th>
+						</tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>快递公司</th><td>
+							<select name="untreadCompany">-->
+							<!--loopexpressList-->
+							<!-- 	<option value="{{expressList' value.company}}:{{expressList' value.com}}">{{expressList' value.company}}</option> -->
+											<!--endloop-->
+					<!-- 
+							</select>
+							</td>
+						</tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>快递单号</th>
+							<td><input type="text" name="untreadNumber" placeholder="请正确填写单号，方便跟踪查询。"></td>
+						</tr>
+						<tr>
+							<th class="taC" width="100"><span class="colRed">*</span>邮寄物品</th>
+							<td><textarea class="span4" name="untreadItems" placeholder="请详细填写邮寄回总部的快递包含什么物件。"></textarea>
+							</td>
+						</tr>
+						</tbody>
+					</table>
+					 -->
+					
+				</div>
+				<div class="modal-footer">
+					<input type="submit" class="button" value="确认提交">
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div></div>
+			</form>
+	</div>
+	
+	
+	
+	
+	<!--退票-->
+	
+	<div class="modal  fade" id="billing">
+		<div id="nr"></div>
+	</div>
+	
+	
+	<div loading-msg='true' style="position:absolute;  left:50%;  top:50%;  "></div>
+	<div class="modal  fade" id="invdetail">
+		<div id="nc"></div>
+	</div>
+	
+<script type="text/javascript">autoFlashHeight();</script>
+</body>

protected/view/contacts_client.html

@@ -6,6 +6,11 @@
 <script src="<?= WEB_SITE_GLOBAL ?>/js/jquery.ui.position.js"></script>
 <script src="<?= WEB_SITE_GLOBAL ?>/js/jquery.ui.autocomplete.js"></script>
 <script src="<?= WEB_SITE_GLOBAL ?>/js/autoTag.js"></script>
+
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>/js/bootstrap-datetimepicker.js" charset="UTF-8"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>/js/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
+
 <body>
 	<div class="mainLayout">
 		<div class="mainMenu">

protected/view/lock_look.html

@@ -7,6 +7,11 @@
 <script src="<?= WEB_SITE_GLOBAL ?>/js/jquery.ui.position.js"></script>
 <script src="<?= WEB_SITE_GLOBAL ?>/js/jquery.ui.autocomplete.js"></script>
 <script src="<?= WEB_SITE_GLOBAL ?>/js/autoTag.js"></script>
+
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>/js/bootstrap-datetimepicker.js" charset="UTF-8"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>/js/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
+
 <body>
 
 	<div class="mainLayout">
@@ -65,6 +70,7 @@
 	  					<!-- endloop -->
 	  					</select>
 	  					</li>
+	  					
 	  				</ul>
 	  				<ul class="lockTableUl">
 	  					<li class="clearfix filter"><span>锁号</span><span style="width:18%">产品</span><span>办事处</span><span>出库</span><span>责任人</span><span>状态</span><span>客户</span></li>