废弃审批发票-重构审批发票相关页面

global/css/global.css

@@ -123,6 +123,11 @@ a.disenable{color:#ccc}
 .taC{text-align:center}
 .taL{text-align:left}
 .taR{text-align:right}
+.colTip{
+  margin-left: 2px;
+  display:inline-block;
+  line-height: 19px;
+}
 @font-face {
   font-family: 'ZHcldSystem';
   src:url('fonts/ZHcldSystem.eot');
@@ -1140,7 +1145,8 @@ border-color: #d6e9c6;
   padding:0
 }
 .centerRecord .mostList li.select select{
-  margin:10px 0 0 20px
+  margin:12px 0 0 10px;
+  width:100px
 }
 .infoCenter .dateList {
   overflow: hidden;
@@ -1870,7 +1876,6 @@ a.new-ribbon:before{
 .adminContent{
   margin:0 0 0 160px;
   overflow-y:auto;
-
   padding:0 15px 0 0
 }
 .borad-menu{
@@ -3743,3 +3748,38 @@ td div.dlLev3{
 .invoButton a.buttonUndone:active{
   background:#790000;
 }
+.shipLock {
+  border:1px solid rgba(0,0,0,.125);
+  padding:5px;
+  margin:10px 0
+}
+.shipLock dt{
+  margin-bottom:10px
+}
+.btn-back{
+  background:#ffa132;
+}
+.btn-back:hover{
+  background:#ff8a00;
+}
+.btn-back:active{
+  background:#e57c01;
+}
+.btn-undone{
+  background:#ce5e5e;
+}
+.btn-undone:hover{
+  background:#c01010;
+}
+.btn-undone:active{
+  background:#790000;
+}
+.btn-done{
+  background:#7ea85c;
+}
+.btn-done:hover{
+  background:#4f8e08;
+}
+.btn-undone:active{
+  background:#2a4f00;
+}

global/js/invoice.js

@@ -119,6 +119,12 @@ $(function() {
 		 $('#iras').submit();
 	});
 	
+	$('select[node-invoiceType]').change(function() {
+		 $('#iaa').submit();
+	});
+	$('select[node-invoiceTrain]').change(function() {
+		 $('#iaa').submit();
+	});
 	/**
 	 * 废弃方法
 	$('button[node-irmMebSea]').click(function() {

protected/config/acl.conf.php

@@ -63,6 +63,9 @@ $acl ['ordinary'] ['allow'] = array (
 				//办事处汇总查询权限--现加入普通权限中->另外在做权限判定
 				'invoiceAggregateCategoryDetail',
 				
+				
+				
+				
 				'testSend'
 		) 
 );
@@ -94,6 +97,10 @@ $acl ['发票审批'] ['allow'] = array (
 				'invoiceDetail',
 				'invoiceApprovalDo',
 				'invoiceApprovalAchieve',
+				//开票开发中方法
+				'invoiceApprovalAchieveDevelopment',
+				'ajaxGetinvoiceApprovalAchieveDevelopment',
+				'ajaxGetInvoiceApprovalDetail',
 				
 				'ajaxInvoicePushNotice'
 		) 

protected/config/routes.conf.php

@@ -455,8 +455,17 @@ $route['*']['/invoiceDetail/:iid'] = array('InvoiceController', 'invoiceDetail',
 $route['*']['/invoiceApprovalDo'] = array('InvoiceController', 'invoiceApprovalDo');
 $route['get']['/invoiceApprovalAchieve'] = array('InvoiceController', 'invoiceApprovalAchieve');
 $route['get']['/invoiceApprovalAchieve/:page'] = array('InvoiceController', 'invoiceApprovalAchieve');
-$route['get']['/invoiceApprovalAchieve/:page/:status'] = array('InvoiceController', 'invoiceApprovalAchieve');
-$route['get']['/invoiceApprovalAchieve/:page/:status/:MebSea'] = array('InvoiceController', 'invoiceApprovalAchieve');
+$route['get']['/invoiceApprovalAchieve/:page/:date'] = array('InvoiceController', 'invoiceApprovalAchieve');
+$route['get']['/invoiceApprovalAchieve/:page/:date/:MebSea'] = array('InvoiceController', 'invoiceApprovalAchieve');
+
+//开发中
+$route['get']['/invoiceApprovalAchieveDevelopment'] = array('InvoiceController', 'invoiceApprovalAchieveDevelopment');
+$route['get']['/invoiceApprovalAchieveDevelopment/:status'] = array('InvoiceController', 'invoiceApprovalAchieveDevelopment');
+$route['get']['/invoiceApprovalAchieveDevelopment/:status/:MebSea'] = array('InvoiceController', 'invoiceApprovalAchieveDevelopment');
+$route['post']['/ajaxGetinvoiceApprovalAchieveDevelopment'] = array('InvoiceController', 'ajaxGetinvoiceApprovalAchieveDevelopment');
+
+$route['post']['/ajaxGetInvoiceApprovalDetail'] = array('InvoiceController', 'ajaxGetInvoiceApprovalDetail');
+
 
 //新加信息推送
 $route['get']['/ajaxInvoicePushNotice'] = array('InvoiceController', 'ajaxInvoicePushNotice');

protected/view/admin/invoiceApproval.html

@@ -63,7 +63,7 @@
                         
                         <div class="clearfix">
                         	
-                            <legend><div class="fR"><a href="/invoiceApprovalAchieve">查看更多</a></div>最近审批完成</legend>
+                            <legend><div class="fR"><a href="/invoiceApprovalAchieveDevelopment">查看更多</a></div>最近审批完成</legend>
                             <!-- if !empty({{ilist}}) -->
                             <table class="table table-bordered table-condensed">
                                 <tbody>

protected/view/admin/invoiceApprovalAchieve.html

@@ -18,53 +18,9 @@
 			</div>
 			<div class="adminContent autoHeight">
 				<legend>
-					审批发票
+					已审批发票
 				</legend>
 				<div class="demandCate">
-				
-				<form action="/invoiceApprovalAchieve/1/{{date}}" id="ira" method="get" >
-				<ul class="cateList">
-						<li>
-							<a class="now" href="/invoiceApprovalAchieve/1/ALL">所有</a>
-							<a href="/invoiceApprovalAchieve/1/PEND" title="待审批发票">待审批发票</a>
-							<a href="/invoiceApprovalAchieve/1/APPROVED" title="已审批发票">已审批发票</a>
-						</li>
-						<li>
-							<select name="invoiceType" >
-								<option value="ALL">类型</option>
-								<option value="0">普通发票</option>
-								<option value="1">专用发票</option>
-							</select>
-						</li>
-						<li>
-							<select class="select">
-								<option>个人发票</option>
-								<option>培训班发票</option>
-							</select>
-						</li>
-						<li>
-							<div class="search">
-								<div class="input-append">
-									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true" data-multiple-dates-separator=" - " data-language="zh">
-									<button class="btn btn-small" type="button">查询</button>
-								</div>
-							</div></li>
-						<li>
-							<div class="search">
-								<div class="input-append">
-									
-								<input class="span3" type="text"  data-irmMebSea value="{{MebSeaEn}}" placeholder="发票抬头、开票金额">
-								<button class="btn btn-small" node-iramMebSea type="button">搜索</button>
-								
-								</div>
-							</div></li>
-					</ul>
-					</form>
-				
-				
-				
-				
-				
 					<ul class="cateList">
 						<li><a <!-- if {{date}}=='MONTHO' --> class="now" <!-- endif --> href="/invoiceApprovalAchieve/1/MONTHO/{{MebSea}}">最近一个月</a>
 	  					<a <!-- if {{date}}=='MONTHT' --> class="now" <!-- endif --> href="/invoiceApprovalAchieve/1/MONTHT/{{MebSea}}">最近三个月</a>
@@ -73,10 +29,10 @@
 						<li>
 							<div class="search">
 								<div class="input-append">
-									
+									<form action="/invoiceApprovalAchieve/1/{{date}}" id="ira" method="get" >
 								<input class="span3" type="text"  data-irmMebSea value="{{MebSeaEn}}" placeholder="发票抬头、开票金额">
 								<button class="btn btn-small" node-iramMebSea type="button">搜索</button>
-								
+								</form>
 								</div>
 							</div></li>
 					</ul>

protected/view/admin/invoiceTrainingDetail.html

@@ -480,7 +480,7 @@ table.DTFC_Cloned thead,table.DTFC_Cloned tfoot{background-color:white}div.DTFC_
 			</form>
 			</div>
 					<!--导入-->
-<script type="text/javascript">//autoFlashHeight();
+<script type="text/javascript">
 $(document).ready( function () {
 	
 	var data = {{trainlistJson}}