1

global/js/invoice.validator.js

@@ -89,10 +89,11 @@ $(function () {
 	    	bankAccount:'required(invoiceCompany);'
 	    	,invoicePrice: 'match(lte, 100001)'
 	    	,invoiceQuantity: ' required;'
-	    	,invoiceUnitPrice: 'required; '
+	    	,invoiceUnitPrice: 'required;'
 	    	
 	    	,trainId:'required(isSettlementType); '
-		    ,invoiceElement: 'required; '
+//		    ,items: 'required(isItems); '
+//		    ,tx: 'required;'
 		    ,invoiceType: 'required'
 			,recipients: 'required(isMail); '
 			,recipientsPhone: 'required(isMail); '//digits(isMail);

protected/config/js.edition.conf.php

@@ -14,7 +14,7 @@ define ( "itineraryView2", WEB_SITE_GLOBAL.'js/itineraryView2.0.js?1.12' );
 
 define ( "invoice", WEB_SITE_GLOBAL.'js/invoice.js?1.03' );
 define ( "payments", WEB_SITE_GLOBAL.'js/payments.js?1.04' );
-define ( "invoiceValidator", WEB_SITE_GLOBAL.'js/invoice.validator.js?1.02' );
+define ( "invoiceValidator", WEB_SITE_GLOBAL.'js/invoice.validator.js?1.06' );
 
 define ( "autoTag", WEB_SITE_GLOBAL.'js/autoTag.js?1' );
 define ( "email", WEB_SITE_GLOBAL.'js/email.js?1' );

protected/controller/InvoiceController.php

@@ -7322,6 +7322,7 @@ class InvoiceController extends DooController
 		$pageinfo['page'] = array(
 			'previous' => ''
 		);
+		
 		$pageinfo = $this->get_page("CLD_invoice", $con, $page, $page_size, "invoiceAggregateCompanyDetail", $get, "");
 		$limit = $pageinfo['lower'] . ',' . $page_size;
 

protected/services/invoice_service.php

@@ -29,7 +29,12 @@ class invoice_service
 	{
 		// 获得全部发票项
 		$list = $this->invoiceItem->getAll();
-		return $list;
+		$data = array();
+		foreach ($list as  $value) {
+			$item = $this->makeInvoiceItem($value);
+			array_push($data, $item);
+		}
+		return $data;
 	}
 
 	/* 获得办事处和创建的 培训班发票 */
@@ -52,7 +57,7 @@ class invoice_service
 			$detail = $lCategory->getCategoryById($value['cid']);
 			$list[$key]['category'] = $detail;
 
-			// 			每个培训班发票总数和金额，入账总数
+			// 每个培训班发票总数和金额，入账总数
 			$invoiceList = $this->invoice->GetTrainByUnFinish($value['itid']);
 
 			$list[$key]['invoiceTotal'] = count($invoiceList);
@@ -77,4 +82,19 @@ class invoice_service
 		// 		print_r ( $list );
 		// 		die ();
 	}
+	
+	private  function makeInvoiceItem($data)
+	{
+		$resultData = array();
+		if (!empty($data)) {
+			$resultData = [
+					'id' => $this->XDeode->encode($data['id']),
+					'name' => $data['name'],
+					'rate' => $data['rate'],
+					'sort' => $data['sort'],
+			];
+		}
+	
+		return $resultData;
+	}
 }

protected/view/admin/invoiceAdd.html

@@ -116,8 +116,12 @@ $('button[invoiceDetalfn]').click(function() {
 		invoiceType='增值税普通发票（电子发票）';
 	}
 	
+	var invoiceElement="<br/>";
+	$.each($('input[name=items]:checkbox:checked'),function(){
+		invoiceElement+=$(this).attr("itemName")+"<br/>";
+    });
 	
-	var invoiceElement=$('#invoiceElement option:selected').html();
+	//var invoiceElement=$('#invoiceElement option:selected').html();
 	var invoiceQuantity=$("#invoiceQuantity").val();
 	var invoiceUnitPrice=$("#invoiceUnitPrice").val();
 	var invoicePrice=invoiceQuantity*invoiceUnitPrice;
@@ -261,6 +265,40 @@ $('input[type=radio][name=invoiceForm]').change(function() {
 });
 
 
+$('input[rate=13]').click(function() {
+	var flag=false;
+	$.each($('input[rate=13]:checkbox:checked'),function(){
+		flag=true;
+    });
+	if(flag){
+		$('input[rate=6]').removeAttr("checked");
+	}
+	/* if(flag){
+		$('input[rate=6]').attr("disabled","false");
+	}else{
+		$('input[rate=6]').removeAttr("disabled");
+	} */
+});
+$('input[rate=6]').click(function() {
+	var flag=false;
+	$.each($('input[rate=6]:checkbox:checked'),function(){
+		flag=true;
+    });
+	if(flag){
+			$('input[rate=13]').removeAttr("checked");
+		}else{
+			//$('input[rate=13]').attr("checked","true");
+			
+		}
+	
+	//if(flag){
+	//	$('input[rate=13]').attr("disabled","false");
+	//}else{
+	//	$('input[rate=13]').removeAttr("disabled");
+	//}
+});
+
+
 })
 
 </script>
@@ -295,7 +333,7 @@ $('input[type=radio][name=invoiceForm]').change(function() {
 								
 								<tr>
 									<th class="taC" width="150">所在办事处</th>
-									<td>
+									<td width="300">
 										<select name="cid" id="cid">
 								<!-- loop category -->
 								<option <!-- if {{category' value.cid}} == {{staff.0.cid}}  --> selected <!-- endif --> value="{{category' value.cid}}" >{{category' value.title}}</option>
@@ -304,14 +342,15 @@ $('input[type=radio][name=invoiceForm]').change(function() {
 									</td>
 									<th class="taC"><span class="colRed">*</span>开票内容</th>
 									<td>
+									<!-- loop invoiceItemList -->
+									 <!-- if {{invoiceItemList' value.rate}}==6 -->
+										  <br/>
+										  <!-- endif -->
+										<label><input type="checkbox"  name="items"  rate="{{invoiceItemList' value.rate}}"   value="{{invoiceItemList' value.id}}"
+										  itemName='{{invoiceItemList' value.name}}' data-rule="checked" >{{invoiceItemList' value.name}}</label>
+										 
+									<!-- endloop -->
 									
-									
-									<select name="invoiceElement" id="invoiceElement">
-										<!-- loop invoiceItemList -->
-										
-										<!-- endloop -->
-										
-									</select>
 								</td>
 								</tr>
 								<tr>
@@ -560,7 +599,7 @@ $('input[type=radio][name=invoiceForm]').change(function() {
 							<div class="modal-footer">
 							<input type="submit" class="button" value="无误，提交申请">
 							    
-							    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">我要检查一下</a>
+							    <a href="javascript:void(0)" class="button btn-gray" data-dismiss="modal" aria-hidden="true">我要检查一下</a>
 							</div>
 						</div>
 						</div>