1

global/js/invoice.validator.js

@@ -53,8 +53,8 @@ $(function () {
 	});
 	
 	$('#invoice').validator({
-	    timely: 3,
-	    focusCleanup: true,
+//		timely: 3,
+//	    focusCleanup: true,
 	    rules: {
 	    	invoiceTitle: function() {
 	    		return $('#invoicePlain').prop('checked');
@@ -68,6 +68,7 @@ $(function () {
 	        ,isSettlementType: function() {
 	        	return $('#settlementType').prop('checked');
 	        }
+	        
 //	        ,isInvoicePrice: function() {
 //	        	var invoicePrice=$('#isInvoicePrice').val();
 //	        	console.log(invoicePrice);

protected/config/acl.conf.php

@@ -55,6 +55,9 @@ $acl ['ordinary'] ['allow'] = array (
 				'invoiceStoreBatchDelete',
 				'invoiceStoreBatchMailItemSet',
 				'invoiceStoreBatchApproval',
+				
+				
+				
 				'ajaxGetMailItemByIstore',
 				'invoiceExpress',
 				'invoiceReceivablesTitleMarkSet',
@@ -232,6 +235,10 @@ $acl ['INVOICE'] ['allow'] = array (
 				'invoiceStoreBatchDelete',
 				'invoiceStoreBatchMailItemSet',
 				'invoiceStoreBatchApproval',
+				
+				'invoiceStoreBatchElectronicPhone',
+				'invoiceStoreBatchElectronicEmail',
+				
 				'ajaxGetMailItemByIstore',
 				'invoiceExpress',
 				'invoiceReceivablesTitleMarkSet',
@@ -275,7 +282,8 @@ $acl ['INVOICE'] ['allow'] = array (
 				'invoiceAddFill',
 				'ajaxGetInvoiceByNew',
 				'invoiceUntreadRecallDo',
-				'invoiceUntreadED'
+				'invoiceUntreadED',
+				'invoiceTrainingElectronicDetail'
 		)
 );
 

protected/config/js.edition.conf.php

@@ -6,7 +6,7 @@ define ( "receiptExtend", WEB_SITE_GLOBAL.'js/receiptExtend.js?1.03' );
 define ( "receipt", WEB_SITE_GLOBAL.'js/receipt.js?1.10' );
 define ( "invoice", WEB_SITE_GLOBAL.'js/invoice.js?1.02' );
 define ( "payments", WEB_SITE_GLOBAL.'js/payments.js?1.02' );
-define ( "invoiceValidator", WEB_SITE_GLOBAL.'js/invoice.validator.js?1.01' );
+define ( "invoiceValidator", WEB_SITE_GLOBAL.'js/invoice.validator.js?1.02' );
 
 define ( "autoTag", WEB_SITE_GLOBAL.'js/autoTag.js?1' );
 define ( "email", WEB_SITE_GLOBAL.'js/email.js?1' );

protected/config/routes.conf.php

@@ -465,6 +465,9 @@ $route['get']['/invoiceReceivablesAchieve/:page/:date/:MebSea'] = array('Invoice
 $route['*']['/invoiceTraining'] = array('InvoiceController', 'invoiceTraining');
 $route['post']['/invoiceTrainingAdd'] = array('InvoiceController', 'invoiceTrainingAdd');
 $route['*']['/invoiceTrainingDetail/:trainingKey'] = array('InvoiceController', 'invoiceTrainingDetail','extension'=>'.html');
+$route['*']['/invoiceTrainingElectronicDetail/:trainingKey'] = array('InvoiceController', 'invoiceTrainingElectronicDetail','extension'=>'.html');
+
+
 $route['post']['/invoiceTrainingDelDo'] = array('InvoiceController', 'invoiceTrainingDelDo');
 
 $route['*']['/invoiceTrainingUpload'] = array('InvoiceController', 'invoiceTrainingUpload');
@@ -479,6 +482,9 @@ $route['post']['/invoiceStoreBatchDelete'] = array('InvoiceController', 'invoice
 $route['post']['/invoiceStoreBatchMailItemSet'] = array('InvoiceController', 'invoiceStoreBatchMailItemSet');
 $route['post']['/invoiceStoreBatchApproval'] = array('InvoiceController', 'invoiceStoreBatchApproval');
 
+$route['post']['/invoiceStoreBatchElectronicPhone'] = array('InvoiceController', 'invoiceStoreBatchElectronicPhone');
+$route['post']['/invoiceStoreBatchElectronicEmail'] = array('InvoiceController', 'invoiceStoreBatchElectronicEmail');
+
 $route['post']['/invoiceSettlementChange'] = array('InvoiceExtendController', 'invoiceSettlementChange');
 
 
@@ -493,6 +499,8 @@ $route['post']['/ajaxGetInvoiceReceivables'] = array('InvoiceController', 'ajaxG
 
 $route['post']['/ajaxGetInvoice'] = array('InvoiceAjaxController', 'ajaxGetInvoice');
 
+$route['get']['/api/invoice'] = array('InvoiceAjaxController', 'api_invoice');
+
 //发票信息库获得数据
 $route['*']['/autoFillInIFB'] = array('InvoiceAjaxController', 'autoFillInIFB');
 
@@ -629,6 +637,8 @@ $route['post']['/ajaxCheckInvoiceReceivablesRefund'] = array('InvoiceController'
 
 
 
+
+
 // $route['get']['/invoiceReceivablesAS/:page/:status/:year'] = array('InvoiceController', 'invoiceReceivablesAS');
 // $route['get']['/invoiceReceivablesAS/:page/:status/:year/:month'] = array('InvoiceController', 'invoiceReceivablesAS');
 // $route['get']['/invoiceReceivablesAS/:page/:status/:year/:month/:MebSea'] = array('InvoiceController', 'invoiceReceivablesAS');
@@ -669,6 +679,7 @@ $route['*']['/ajaxGetinvoicePaperAchieve'] = array('InvoiceController', 'ajaxGet
 
 $route['*']['/invoiceElectronic'] = array('InvoiceController', 'invoiceElectronic');
 
+
 //数据导入
 $route['*']['/importInvoice'] = array('InvoiceController', 'importInvoice');
 $route['*']['/uploadInvoice'] = array('InvoiceController', 'uploadInvoice');

protected/config/wasteBook.conf.php

@@ -3,20 +3,20 @@
 $waste['total']=0;
 //存款部分
 $waste ['bank'] = array (
-		'CGBDeposit' => 481342.14,
-		'ICBCDeposit' => 73.94,
-		'HUADeposit' => 10653.71,
-		'PersonalDeposit' => 62337.22,
+		'CGBDeposit' => 708202.03,   //广发存款
+		'ICBCDeposit' => 588829.12,      //工行存款
+		'HUADeposit' => 161441.20,	//纵横广发（其中纵横知道充值金额）
+		'PersonalDeposit' => 93850.16, //个人存款
 );
 //理财部分
 $waste ['financial'] = array (
 		'current' => array(
-				'CGBDeposit' => 0,
-				'ICBCDeposit' => 1695805.63,
+				'CGBDeposit' => 0,					//广发活期
+				'ICBCDeposit' => 7000725.18,		//工行活期
 		),
 		'fixed' => array(
-				'CGBDeposit' => 1800000,
-				'ICBCDeposit' => 0,
+				'CGBDeposit' => 3000000.00,			//广发固定
+				'ICBCDeposit' => 300000.00,					//个人固定
 		),
 		
 );

protected/controller/InvoiceAjaxController.php

@@ -73,8 +73,15 @@ class InvoiceAjaxController extends DooController {
 		}
 	}
 	
-	function ajaxGetInvoceList(){
+	function api_invoice(){
+		$filter = $_GET['filter'];
+		$filter=json_decode($filter,true);
 		
+		Doo::loadModel ( 'invoice' );
+		$invoice = new invoice ();
+		
+		$result=$invoice->get_invoice($filter);
+		echo json_encode ( $result );
 	}
 	
 	/**

protected/controller/MainController.php

@@ -6915,8 +6915,8 @@ class MainController extends DooController {
 					<b><span name="titleHtml">' . $title . '</span></b></p></td>
 
 					</tr><tr><td><table align="center" cellspacing="0" cellpadding="0" style="border:1px solid #ddd;"><tbody><tr>
-					<td align="center" style="background-color:#EEF2F5;padding:20px 0 "><a style="text-decoration:none;" href="http://www.teambition.com/" target="_blank"><img width="291px" height="46" src="http://zonghengvideo.qiniudn.com/maillogo1.png"></a></td>
-					</tr><tr><td align="center" style="background-color:#fff;"><img width="640" height="191" src="http://zonghengvideo.qiniudn.com/hero.jpg"></td>
+					<td align="center" style="background-color:#EEF2F5;padding:20px 0 "><a style="text-decoration:none;" href="https://smartcost.com.cn" target="_blank"><img src="http://d4.smartcost.com.cn/zonghenglogo.png"></a></td>
+					</tr><tr><td align="center" style="background-color:#fff;"></td>
 					</tr><tr><td align="left" style="background-color:#fff;padding:40px;border-bottom:1px solid #ddd;">
 
 					<p style="margin-top:0px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;"><b>CLIENTNAME</b></p>
@@ -6978,7 +6978,7 @@ class MainController extends DooController {
 				             <td align="right" style="background:#fff url(http://zonghengvideo.qiniudn.com/mail3-top-bg.png) no-repeat top center;padding:30px 20px 20px 20px;border-bottom:1px solid #E9EBE2;">
 				             	<div style="position:relative;text-align:right">
 				              <b style="font-size:24px;color:#8A9F98;z-index:999"><span name="titleHtml">' . $title . '</span></b>
-				              <div style="width:80px;height:80px;position:absolute;top:0;left:0"><img src="http://zonghengvideo.qiniudn.com/zonghenglogo.png"></div>
+				              <div style="width:80px;height:80px;position:absolute;top:0;left:0"><img src="http://d4.smartcost.com.cn/zonghenglogo.png"></div>
 				              </div>
 				             </td>
 				            </tr>

protected/controller/ReceiptController.php

@@ -13270,7 +13270,8 @@ class ReceiptController extends DooController {
 		
 		$inComeStatistics = $wasteBook->getWasteBookStatisticsByIncome ();
 		$waste = $this->getWasteBookStatistics ( $waste, $inComeStatistics );
-		$total = $waste ['bank'] ['CGBDeposit'] + $waste ['bank'] ['ICBCDeposit'] + $waste ['bank'] ['HUADeposit'] + $waste ['bank'] ['PersonalDeposit'] + $waste ['financial'] ['current'] ['CGBDeposit'] + $waste ['financial'] ['current'] ['ICBCDeposit'] + $waste ['financial'] ['fixed'] ['CGBDeposit'] + $waste ['financial'] ['fixed'] ['ICBCDeposit'];
+		//+ $waste ['bank'] ['HUADeposit']
+		$total = $waste ['bank'] ['CGBDeposit'] + $waste ['bank'] ['ICBCDeposit']  + $waste ['bank'] ['PersonalDeposit'] + $waste ['financial'] ['current'] ['CGBDeposit'] + $waste ['financial'] ['current'] ['ICBCDeposit'] + $waste ['financial'] ['fixed'] ['CGBDeposit'] + $waste ['financial'] ['fixed'] ['ICBCDeposit'];
 		// print_r($waste);
 		
 		$data ['waste'] = $waste;

protected/model/invoice.php

@@ -200,6 +200,9 @@ class invoice extends DooModel {
 	public $accountingTime;
 	public $parentUntreadIid;
 	public $inheritIid;
+	
+	public $electronicPhone;
+	public $electronicEmail;
 
 	public $_table = 'CLD_invoice';
 	public $_primarykey = 'iid';
@@ -265,9 +268,112 @@ class invoice extends DooModel {
 			'settlementType',
 			'accountingTime',
         'parentUntreadIid',
-        'inheritIid'
+        'inheritIid',
+			'electronicPhone',
+			'electronicEmail',
 	);
 
+	function get_invoice($filter){
+		
+		$qualification=array('limit'=>20,'desc'=>'iid','asArray' => TRUE);
+		
+		if(isset($filter['fields'])){
+			$qualification+=array('select'=> $filter['fields']);
+		}
+		
+		if(isset($filter['where'])){
+			$parameter=$condition=array();
+			foreach ($filter['where'] as $wk=>$wv){
+				$formula=explode('_', $wk);
+				$field=$formula[0];
+				$symbol='=';
+				if (isset($formula[1])&&$formula[1]=='like'){
+					$symbol='like';
+				}elseif(isset($formula[1])&&$formula[1]=='or'){
+					$symbol='or';
+				}
+				if(empty($wv)){
+					$wv='';
+				}
+				
+				
+				if($symbol=='like'&&!empty($wv)){
+					if($field=='invoiceTitle'&&!empty($wk)){
+						array_push($condition, ' ('.$field.' like ? or invoiceCompany like ? ) ');
+						array_push($parameter, '%'.$wv.'%');array_push($parameter, '%'.$wv.'%');
+					}else{
+						array_push($condition, $field.' like ?');
+						array_push($parameter, '%'.$wv.'%');
+					}
+					
+				}elseif($symbol=='or'&&!empty($wv)){
+					array_push($condition, $field.' in ( ? )');
+					$wv=implode(',', $wv);
+					array_push($parameter, $wv);
+				}else{
+					array_push($condition, $field.'=?');
+					array_push($parameter, $wv);
+				}
+				
+				
+				
+				/* if($field=='invoiceTitle'&&!empty($wk)){//特殊处理字段
+					if($symbol=='like'&&!empty($wv)){
+						array_push($condition, ' ('.$field.' like ? or invoiceCompany like ? ) ');
+						array_push($parameter, '%'.$wv.'%');array_push($parameter, '%'.$wv.'%');
+					}else{
+						array_push($condition, ' ('.$field.'=?  ) ');
+						array_push($parameter, $wv);
+					}
+				}else{
+					if($symbol=='like'&&!empty($wv)){
+						array_push($condition, $field.' like ?');
+						array_push($parameter, '%'.$wv.'%');
+					}elseif($symbol=='or'&&!empty($wv)){
+						echo $wv;
+					}else{
+						array_push($condition, $field.'=?');
+						array_push($parameter, $wv);
+					}
+				} */
+				
+			}
+			$condition=implode(' and ', $condition);
+			
+			$qualification+=array(
+					'where'=> $condition,
+					'param' => $parameter
+			);
+		}
+		
+		//print_r($qualification);
+		
+		$result=$this->find($qualification);
+		
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 5 );
+		
+		foreach ($result as $key=>$value){
+			if(!empty($value['invoiceCompany'])){
+				$result[$key]['invoiceTitle']= $value ['invoiceCompany'] ;
+			}
+			
+			if($value['printTime']==null){
+				$result[$key]['printTime']= '' ;
+			}
+			
+			
+			$result[$key]['iid']=$XDeode->encode ( $value ['iid'] );
+			$result[$key]['cid']=$XDeode->encode ( $value ['cid'] );
+			$result[$key]['sid']=$XDeode->encode ( $value ['sid'] );
+			$result[$key]['trainId']=$XDeode->encode ( $value ['trainId'] );
+			$result[$key]['lossIid']=$XDeode->encode ( $value ['lossIid'] );
+			$result[$key]['isid']=$XDeode->encode ( $value ['isid'] );
+		}
+		
+		return $result;
+	}
+	
     /**
      * 获得培训班结算金额总和
      * @param iids $

protected/model/invoiceTraining.php

@@ -117,6 +117,7 @@ class invoiceTraining extends DooModel {
 				'where' => " settlementStatus=" . $SStatus . ' and cid=' . $cid. ' and bindReceipt=' . $bindReceipt,
 				'asArray' => TRUE 
 		);
+		
 		$list = $this->find ( $condition );
 		Doo::loadClass ( 'XDeode' );
 		$XDeode = new XDeode ( 5 );

protected/view/admin/invoiceAdd.html

@@ -1,4 +1,5 @@
 <!-- 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>
@@ -82,7 +83,7 @@ $('button[invoiceDetalfn]').click(function() {
 	}
 	
 	var it=$("input[name='invoiceType']:checked").val();
-	
+	var invoiceForm=$("input[name='invoiceForm']:checked").val();
 	
 	var invoiceTitle=$("#invoiceTitle").val();
 	var TINT=$("#TINT").val();
@@ -113,6 +114,11 @@ $('button[invoiceDetalfn]').click(function() {
 		bankAccountT=bankAccount;
 	}
 	
+	if(invoiceForm=='electronic'){
+		invoiceType='增值税普通发票（电子发票）';
+	}
+	
+	
 	var invoiceElement=$('#invoiceElement option:selected').html();
 	var invoiceQuantity=$("#invoiceQuantity").val();
 	var invoiceUnitPrice=$("#invoiceUnitPrice").val();
@@ -238,11 +244,30 @@ $("input[autoIFBTIN]").autocomplete({
 });
 
 
+$('input[type=radio][name=invoiceForm]').change(function() {
+	   if (this.value == 'paper') {
+		   $('tr[paperTR]').show();
+		   $('tr[electronicTR]').hide();
+		   $('table[electronicContact]').hide();
+		   $('div[paperMark]').show();
+		   $('#electronicPhone').val('1');
+		   
+	   } else if (this.value == 'electronic') {
+		   $('tr[paperTR]').hide();
+		   $('tr[electronicTR]').show();
+		   $('table[electroniCcontact]').show();
+		   $('div[paperMark]').hide();
+		   $('#electronicPhone').val('');
+		   
+	   }
+});
+
 
 })
 
 </script>
 <body>
+
 	<div class="mainLayout">
 		<div class="mainMenu">
 			<div class="menuItem">
@@ -263,7 +288,7 @@ $("input[autoIFBTIN]").autocomplete({
 				<legend>填写申请开票</legend>
 				<div class="borad-news">
 					<div class="saeaList">
-						<form action="/invoiceAddDo"  method="post" id="invoice">
+						<form action="/invoiceAddDo"  method="post" class="invoice" id="invoice" data-validator-option="{timely:3,showOk:''}">
 							<input type="hidden" name="token" value="{{token}}">
 							<input type="hidden" name="tokenTime" value="{{tokenTime}}">
 						<table class="table table-bordered table-condensed">
@@ -307,19 +332,25 @@ $("input[autoIFBTIN]").autocomplete({
 									
 								</tr>
 								
-								<tr>
+								<tr >
 									<th class="taC">发票备注</th><td colspan="3"><textarea placeholder="用于发票右下角备注栏内容，如项目名称、项目地点" name="remark" style="width:550px"></textarea>
 									</td>
 								</tr>
 								
 								<tr>
 									<th class="taC"><span class="colRed">*</span>发票形式</th><td colspan="3">
-									<label class="radio inline"><input type="radio" checked name="invoiceForm" value="paper">纸质发票</label>
-									<label class="radio inline"><input type="radio" name="invoiceForm" value="electronic">电子发票</label>
+									<label class="radio inline"><input type="radio"  checked name="invoiceForm" value="paper">纸质发票</label>
+									<label class="radio inline" ><input type="radio" name="invoiceForm" id="invoiceForm" value="electronic" >电子发票</label>
 									</td>
 								</tr>
 								
-								<tr>
+								<tr style="display:none" electronicTR >
+									<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
+									增值税普通发票（电子发票）
+									</td>
+								</tr>
+								
+								<tr paperTR>
 									<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
 									<label class="radio inline"><input checked name="invoiceType" id="invoicePlain" onclick="invoiceShow()"  value="0" type="radio"  >增值税普通发票</label>
 									<label class="radio inline colRed"><input name="invoiceType" id="invoiceSpecial" onclick="invoiceShow()"  value="1" type="radio">增值税专用发票</label>
@@ -449,9 +480,9 @@ $("input[autoIFBTIN]").autocomplete({
 									    软件锁 （个）<br><input type="number" name="softLockNum" class="span1" placeholder="数量" value="1">
 									  
 									</div>
-									<div class="checkbox">
+									<div paperMark class="checkbox">
 									  
-									    <input type="checkbox" checked disabled value="1">
+									    <input  type="checkbox" checked disabled value="1">
 									    发票 （张）<br>1
 									  
 									</div>
@@ -483,30 +514,53 @@ $("input[autoIFBTIN]").autocomplete({
 									</div>
 								</td>
 									
-									
-<!-- <input placeholder="请详细填写需要邮寄的物品及数量，如：锁套装x1、合同x1" name="mailItems" type="text" class="span6"></td>  -->
+
 								</tr>
 								</tbody>
 							</table>
+							
+							<table style="display:none" electronicContact class="table table-bordered table-condensed">
+								<tbody>
+								<tr>
+									<th colspan="4" class="taC">电子发票发送</th>
+								</tr>
+								<tr>
+									<th class="taC" width="150">收件人手机</th>
+									<td><input class="contact" type="text"  name="electronicPhone" id="electronicPhone" value="1" placeholder="手机号"
+									data-rule="required(from, .contact); digits" data-msg-required="请至少填写一种联系方式">
+									</td>
+								</tr>
+								<tr>
+									<th class="taC" width="150">收件人邮箱</th>
+									<td><input class="contact" type="text"   name="electronicEmail"  placeholder="邮箱"
+									data-rule="required(from, .contact); email">
+									</td>
+								</tr>
+								<tr>
+									<td class="taC" width="150" colspan="4"><span class="colRed">*电子发票收取方式二选一，手机和邮箱，请必填一项，推荐邮箱。</span></td>
+								</tr>
+								</tbody>
+							</table>
+							
 						<p class="taR"><button type="button" class="button" invoiceDetalfn href="#confirm" data-toggle="modal">提交申请</button></p>
 						
 						<div class="modal hide fade" id="confirm">
-  <div class="modal-dialog">
-    <div class="modal-content">
-    <div class="modal-header">
-    <h3>确认信息无误</h3>
-    </div>
-    <div class="modal-body" id="modalBody">
-    	
-    </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>
-</div>
+						  <div class="modal-dialog">
+						    <div class="modal-content">
+						    <div class="modal-header">
+						    <h3>确认信息无误</h3>
+						    </div>
+						    <div class="modal-body" id="modalBody">
+						    	
+						    </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>
+						</div>
 						
 						
 						</form>

protected/view/admin/invoiceAddFill.html

@@ -29,6 +29,7 @@ $('button[invoiceDetalfn]').click(function() {
 	}
 	
 	var it=$("input[name='invoiceType']:checked").val();
+	var invoiceForm=$("input[name='invoiceForm']:checked").val();
 	
 	
 	var invoiceTitle=$("#invoiceTitle").val();
@@ -60,6 +61,10 @@ $('button[invoiceDetalfn]').click(function() {
 		bankAccountT=bankAccount;
 	}
 	
+	if(invoiceForm=='electronic'){
+		invoiceType='增值税普通发票（电子发票）';
+	}
+	
 	var invoiceElement=$('#invoiceElement option:selected').html();
 	var invoiceQuantity=$("#invoiceQuantity").val();
 	var invoiceUnitPrice=$("#invoiceUnitPrice").val();
@@ -183,7 +188,23 @@ $("input[autoIFBTIN]").autocomplete({
     }
 });
 
-
+$('input[type=radio][name=invoiceForm]').change(function() {
+	   if (this.value == 'paper') {
+		   $('tr[paperTR]').show();
+		   $('tr[electronicTR]').hide();
+		   $('table[electronicContact]').hide();
+		   $('div[paperMark]').show();
+		   $('#electronicPhone').val('1');
+		   
+	   } else if (this.value == 'electronic') {
+		   $('tr[paperTR]').hide();
+		   $('tr[electronicTR]').show();
+		   $('table[electroniCcontact]').show();
+		   $('div[paperMark]').hide();
+		   $('#electronicPhone').val('');
+		   
+	   }
+});
 
 })
 </script>
@@ -208,7 +229,7 @@ $("input[autoIFBTIN]").autocomplete({
 				<legend>填写申请开票</legend>
 				<div class="borad-news">
 					<div class="saeaList">
-						<form action="/invoiceAddDo"  method="post" id="invoice">
+						<form action="/invoiceAddDo"  method="post" id="invoice" data-validator-option="{timely:3,showOk:''}">
 							<input type="hidden" name="token" value="{{token}}">
 							<input type="hidden" name="tokenTime" value="{{tokenTime}}">
 						<table class="table table-bordered table-condensed">
@@ -261,11 +282,17 @@ $("input[autoIFBTIN]").autocomplete({
 								<tr>
 									<th class="taC"><span class="colRed">*</span>发票形式</th><td colspan="3">
 									<label class="radio inline"><input type="radio" <!-- if {{invoiceDetail.invoiceForm}}==0 --> checked <!-- endif --> name="invoiceForm" value="paper">纸质发票</label>
-									<label class="radio inline"><input type="radio" <!-- if {{invoiceDetail.invoiceForm}}==1 --> checked <!-- endif --> name="invoiceForm" value="electronic">电子发票</label>
+									<label class="radio inline" ><input type="radio" s <!-- if {{invoiceDetail.invoiceForm}}==1 --> checked <!-- endif --> name="invoiceForm" value="electronic">电子发票</label>
 									</td>
 								</tr>
 								
-								<tr>
+								<tr <!-- if {{invoiceDetail.invoiceForm}}==0 --> style="display:none" <!-- endif --> electronicTR >
+									<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
+									增值税普通发票（电子发票）
+									</td>
+								</tr>
+								
+								<tr <!-- if {{invoiceDetail.invoiceForm}}==1 --> style="display:none" <!-- endif --> paperTR>
 									<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
 									<label class="radio inline"><input <!-- if {{invoiceDetail.invoiceType}}==0 --> checked <!-- endif --> name="invoiceType" id="invoicePlain" onclick="invoiceShow()"  value="0" type="radio"  >增值税普通发票</label>
 									<label class="radio inline colRed"><input <!-- if {{invoiceDetail.invoiceType}}==1 --> checked <!-- endif --> name="invoiceType" id="invoiceSpecial" onclick="invoiceShow()"  value="1" type="radio">增值税专用发票</label>
@@ -396,7 +423,7 @@ $("input[autoIFBTIN]").autocomplete({
 									    软件锁 （个）<br><input type="number" name="softLockNum" class="span1" placeholder="数量" value="{{invoiceDetail.mailItemsArray.softLock}}">
 									  </label>
 									</div>
-									<div class="checkbox">
+									<div paperMark <!-- if {{invoiceDetail.invoiceForm}}==1 --> style="display:none" <!-- endif --> class="checkbox">
 									  <label>
 									    <input type="checkbox" checked disabled value="1">
 									    发票（张） <br>1
@@ -435,6 +462,30 @@ $("input[autoIFBTIN]").autocomplete({
 								</tr>
 								</tbody>
 							</table>
+							
+							<table <!-- if {{invoiceDetail.invoiceForm}}==0 --> style="display:none" <!-- endif --> electronicContact class="table table-bordered table-condensed">
+								<tbody>
+								<tr>
+									<th colspan="4" class="taC">电子发票发送</th>
+								</tr>
+								<tr>
+									<th class="taC" width="150">收件人手机</th>
+									<td><input class="contact" type="text"  name="electronicPhone" id="electronicPhone" value="{{invoiceDetail.electronicPhone}}" placeholder="手机号"
+									data-rule="required(from, .contact); digits" data-msg-required="请至少填写一种联系方式">
+									</td>
+								</tr>
+								<tr>
+									<th class="taC" width="150">收件人邮箱</th>
+									<td><input class="contact" type="text"   name="electronicEmail"  value="{{invoiceDetail.electronicEmail}}" placeholder="邮箱"
+									data-rule="required(from, .contact); email">
+									</td>
+								</tr>
+								<tr>
+									<td class="taC" width="150" colspan="4"><span class="colRed">*电子发票收取方式二选一，手机和邮箱，请必填一项，推荐邮箱。</span></td>
+								</tr>
+								</tbody>
+							</table>
+							
 						<p class="taR"><button type="button" class="button" invoicedetalfn href="#confirm" data-toggle="modal">提交申请</button></p>
 						
 						<div class="modal hide fade" id="confirm">

protected/view/admin/invoiceApprovalDetail.html

@@ -129,6 +129,21 @@
 							</tbody>
 						</table>
 						<!-- endif -->
+						
+						<!-- if {{invoiceDetail.invoiceForm}}==1 -->
+						<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th colspan="4" class="taC">电子发票发送方式</th>
+						</tr>
+						<tr>
+							<th class="taC" width="150">收件人手机</th><td>{{invoiceDetail.electronicPhone}}</td>
+							<th class="taC" width="150">收件人邮箱</th><td>{{invoiceDetail.electronicEmail}}</td>
+						</tr>
+						</tbody>
+					</table>
+						<!-- endif -->
+						
 						<form action="/invoiceApprovalDo" method="post"  name="invoiceApproval">
 						<input type="hidden" name="invoiceKey" value="{{INVOICEKEY}}">
 						<input type="hidden" name="status" value="">

protected/view/admin/invoiceEdit.html

@@ -3,6 +3,29 @@
 <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>
+$(function() {
+$('input[type=radio][name=invoiceForm]').change(function() {
+	   if (this.value == 'paper') {
+		   $('tr[paperTR]').show();
+		   $('tr[electronicTR]').hide();
+		   $('table[electronicContact]').hide();
+		   $('div[paperMark]').show();
+		   $('#electronicPhone').val('1');
+		   
+	   } else if (this.value == 'electronic') {
+		   $('tr[paperTR]').hide();
+		   $('tr[electronicTR]').show();
+		   $('table[electroniCcontact]').show();
+		   $('div[paperMark]').hide();
+		   $('#electronicPhone').val('');
+		   
+	   }
+});
+})
+</script>
+
 <body>
 	<div class="mainLayout">
 		<div class="mainMenu">
@@ -84,7 +107,21 @@
 									</td>
 								</tr>
 							
+							
 							<tr>
+									<th class="taC"><span class="colRed">*</span>发票形式</th><td colspan="3">
+									<label class="radio inline"><input type="radio" <!-- if {{invoiceDetail.invoiceForm}}==0 --> checked <!-- endif --> name="invoiceForm" value="paper">纸质发票</label>
+									<label class="radio inline" ><input type="radio" s <!-- if {{invoiceDetail.invoiceForm}}==1 --> checked <!-- endif --> name="invoiceForm" value="electronic">电子发票</label>
+									</td>
+								</tr>
+							
+							<tr <!-- if {{invoiceDetail.invoiceForm}}==0 --> style="display:none" <!-- endif --> electronicTR >
+									<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
+									增值税普通发票（电子发票）
+									</td>
+								</tr>
+								
+								<tr <!-- if {{invoiceDetail.invoiceForm}}==1 --> style="display:none" <!-- endif --> paperTR>
 								<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
 								<label class="radio inline"><input name="invoiceType" id="invoicePlain" onclick="invoiceShow()"  value="0" <!-- if {{invoiceDetail.invoiceType}}==0 --> checked <!-- endif --> type="radio">增值税普通发票</label>
 								<label class="radio inline"><input name="invoiceType" id="invoiceSpecial" onclick="invoiceShow()"  value="1" <!-- if {{invoiceDetail.invoiceType}}==1 --> checked <!-- endif --> type="radio">增值税专用发票</label>
@@ -183,7 +220,7 @@
 									    软件锁 <br><input type="number" name="softLockNum" class="span1" placeholder="数量" value="{{invoiceDetail.mailItemsJson.softLock}}">
 									  </label>
 									</div>
-									<div class="checkbox">
+									<div paperMark <!-- if {{invoiceDetail.invoiceForm}}==1 --> style="display:none" <!-- endif --> class="checkbox">
 									  <label>
 									    <input type="checkbox" checked disabled value="1">
 									    发票 <br>1
@@ -222,6 +259,31 @@
 							</tr>
 							</tbody>
 						</table>
+						
+						
+						<table <!-- if {{invoiceDetail.invoiceForm}}==0 --> style="display:none" <!-- endif --> electronicContact class="table table-bordered table-condensed">
+								<tbody>
+								<tr>
+									<th colspan="4" class="taC">电子发票发送</th>
+								</tr>
+								<tr>
+									<th class="taC" width="150">收件人手机</th>
+									<td><input class="contact" type="text"  name="electronicPhone" id="electronicPhone" value="{{invoiceDetail.electronicPhone}}" placeholder="手机号"
+									data-rule="required(from, .contact); digits" data-msg-required="请至少填写一种联系方式">
+									</td>
+								</tr>
+								<tr>
+									<th class="taC" width="150">收件人邮箱</th>
+									<td><input class="contact" type="text"   name="electronicEmail"  value="{{invoiceDetail.electronicEmail}}" placeholder="邮箱"
+									data-rule="required(from, .contact); email">
+									</td>
+								</tr>
+								<tr>
+									<td class="taC" width="150" colspan="4"><span class="colRed">*电子发票收取方式二选一，手机和邮箱，请必填一项，推荐邮箱。</span></td>
+								</tr>
+								</tbody>
+							</table>
+						
 						<p class="alert">重新提交审批，将由退回人继续审批，无需从头开始审批。</p>
 						
 						<p class="taR"><input type="submit" class="button" value="重新审批"></p>

protected/view/admin/invoicePrintDetail.html

@@ -65,7 +65,7 @@
 						<table class="table table-bordered table-condensed">
 							<tbody>
 							<tr>
-								<th colspan="4" class="taC">增值税普通发票</th>
+								<th colspan="4" class="taC">增值税普通发票<!-- if {{invoiceDetail.invoiceForm}}==1 --> ( <span class="colRed">电子发票</span> ) <!-- endif --></th>
 							</tr>
 							<tr>
 								<th class="taC" width="150">发票抬头</th><td colspan="3">{{invoiceDetail.invoiceTitle}}</td>
@@ -131,6 +131,22 @@
 							</tbody>
 						</table>
 						<!-- endif -->
+						
+						<!-- if {{invoiceDetail.invoiceForm}}==1 -->
+						<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th colspan="4" class="taC">电子发票发送方式</th>
+						</tr>
+						<tr>
+							<th class="taC" width="150">收件人手机</th><td>{{invoiceDetail.electronicPhone}}</td>
+							<th class="taC" width="150">收件人邮箱</th><td>{{invoiceDetail.electronicEmail}}</td>
+						</tr>
+						</tbody>
+					</table>
+						<!-- endif -->
+						
+						
 						<form action="/invoicePrintDo" method="post"  name="invoicePrint">
 						<input type="hidden" name="invoiceKey" value="{{INVOICEKEY}}">
 						<table class="table table-bordered table-condensed">

protected/view/admin/invoiceStoreEdit.html

@@ -3,6 +3,29 @@
 <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>
+$(function() {
+$('input[type=radio][name=invoiceForm]').change(function() {
+	   if (this.value == 'paper') {
+		   $('tr[paperTR]').show();
+		   $('tr[electronicTR]').hide();
+		   $('table[electronicContact]').hide();
+		   $('div[paperMark]').show();
+		   $('#electronicPhone').val('1');
+		   
+	   } else if (this.value == 'electronic') {
+		   $('tr[paperTR]').hide();
+		   $('tr[electronicTR]').show();
+		   $('table[electroniCcontact]').show();
+		   $('div[paperMark]').hide();
+		   $('#electronicPhone').val('');
+		   
+	   }
+});
+})
+</script>
+
 <body>
 	<div class="mainLayout">
 		<div class="mainMenu">
@@ -24,7 +47,7 @@
 			</div>
 			<div class="adminContent autoHeight">
 				<legend>
-					填写申请开票
+					修改未提交发票
 				</legend>
 				<div class="borad-news">
 					<div class="saeaList">
@@ -76,6 +99,19 @@
 								</tr>
 							
 							<tr>
+									<th class="taC"><span class="colRed">*</span>发票形式</th><td colspan="3">
+									<label class="radio inline"><input type="radio" <!-- if {{invoiceDetail.invoiceForm}}==0 --> checked="" <!-- endif --> name="invoiceForm" value="paper">纸质发票</label>
+									<label class="radio inline"><input type="radio" <!-- if {{invoiceDetail.invoiceForm}}==1 --> checked="" <!-- endif --> name="invoiceForm" id="invoiceForm" value="electronic">电子发票</label>
+									</td>
+								</tr>
+							
+							<tr <!-- if {{invoiceDetail.invoiceForm}}==0 --> style="display:none" <!-- endif -->  electronicTR >
+									<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
+									增值税普通发票（电子发票）
+									</td>
+								</tr>
+							
+							<tr <!-- if {{invoiceDetail.invoiceForm}}==1 --> style="display:none" <!-- endif --> paperTR>
 								<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
 								<label class="radio inline"><input name="invoiceType" id="invoicePlain" onclick="invoiceShow()"  value="0" <!-- if {{invoiceDetail.invoiceType}}==0 --> checked <!-- endif --> type="radio">增值税普通发票</label>
 								<label class="radio inline"><input name="invoiceType" id="invoiceSpecial" onclick="invoiceShow()"  value="1" <!-- if {{invoiceDetail.invoiceType}}==1 --> checked <!-- endif --> type="radio">增值税专用发票</label>
@@ -214,6 +250,29 @@
 							</tbody>
 						</table>
 						
+						<table <!-- if {{invoiceDetail.invoiceForm}}==0 --> style="display:none" <!-- endif -->  electronicContact class="table table-bordered table-condensed">
+								<tbody>
+								<tr>
+									<th colspan="4" class="taC">电子发票发送</th>
+								</tr>
+								<tr>
+									<th class="taC" width="150">收件人手机</th>
+									<td><input class="contact" type="text"  name="electronicPhone" id="electronicPhone" value="{{invoiceDetail.electronicPhone}}" placeholder="手机号"
+									data-rule="required(from, .contact); digits" data-msg-required="请至少填写一种联系方式">
+									</td>
+								</tr>
+								<tr>
+									<th class="taC" width="150">收件人邮箱</th>
+									<td><input class="contact" type="text"   name="electronicEmail" value="{{invoiceDetail.electronicEmail}}"  placeholder="邮箱"
+									data-rule="required(from, .contact); email">
+									</td>
+								</tr>
+								<tr>
+									<td class="taC" width="150" colspan="4"><span class="colRed">*电子发票收取方式二选一，手机和邮箱，请必填一项，推荐邮箱。</span></td>
+								</tr>
+								</tbody>
+							</table>
+						
 						<p class="taR"><button type="submit" class="button" href="#confirm" data-toggle="modal">保存</button></p>
 					</p>
 					</form>

protected/view/admin/invoiceTrainingDetail.html

@@ -1,9 +1,5 @@
 <!-- include 'header' -->
 
-<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/swfupload.js"></script>
-<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/swfupload.queue.js"></script>
-<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/fileprogress.js"></script>
-<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/handlers.js"></script>
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/invoice.js"></script>
 
 <link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>js/DataTables/jquery.dataTables.css"> 
@@ -22,49 +18,48 @@ table.DTFC_Cloned thead,table.DTFC_Cloned tfoot{background-color:white}div.DTFC_
 
 <script type="text/javascript">
 
-		var swfu;
 
-		window.onload = function() {
-			var settings = {
-				flash_url : "<?= WEB_SITE_GLOBAL ?>js/swfuplad2/swfupload.swf",
-				upload_url: "/invoiceTrainingUpload",	// Relative to the SWF file
-				
-				file_size_limit : "8 MB",
-				file_types : "*.xlsx",
-				file_types_description : "*.xlsx",
-				file_upload_limit : 8,
-				file_queue_limit : 1,
-				custom_settings : {
-					progressTarget : "fsUploadProgress",
-					cancelButtonId : "btnCancel"
-				},
-				debug: false,
+$(function() {
+//h5文件上传
+var numFilesUploaded=0;
+$("input[enclosurFile]").change(function() {
+	
+	var form_data = new FormData();
+	var file_data = $(this).prop("files")[0];
+	
+	form_data.append("Filename", file_data.name);
+	form_data.append("Filedata", file_data);
+	
+	$.ajax({
+	    type: "POST",
+	    url: "/invoiceTrainingUpload",
+	    dataType : "json",
+	    processData: false,  // 注意：让jQuery不要处理数据
+	    contentType: false,  // 注意：让jQuery不要设置contentType
+	    data: form_data
+	}).success(function(msg) {
+		var status = document.getElementById("divStatus");
+		numFilesUploaded+=1;
+		status.innerHTML = file_data.name+"上传成功 <br/>"+numFilesUploaded+" 个文件已上传.";
+		
+		var en=$('#enclosurName').val();
+		if (en!='')
+			$('#enclosurName').val(en+'-'+msg.filename);
+		else
+			$('#enclosurName').val(msg.filename);
+		
+		
+		
+		
+	}).fail(function(msg) {
+	    //console.log(msg);
+	});
+});
 
-				// Button settings
-				button_image_url: "<?= WEB_SITE_GLOBAL ?>images/btn-normal1.jpg",	// Relative to the Flash file
-				
-				button_width: "200",
-				button_height: "40",
-				button_placeholder_id: "spanButtonPlaceHolder",
-				//button_text: '<span class="theFont">浏览</span>',
-				//button_text_style: ".theFont { font-size: 16; }",
-				//button_text_left_padding: 12,
-				//button_text_top_padding: 3,
+})
 
-				// The event handler functions are defined in handlers.js
-				file_queued_handler : fileQueued,
-				file_queue_error_handler : fileQueueError,
-				file_dialog_complete_handler : fileDialogComplete,
-				upload_start_handler : uploadStart,
-				upload_progress_handler : uploadProgress,
-				upload_error_handler : uploadError,
-				upload_success_handler : uploadSuccess,
-				upload_complete_handler : uploadComplete,
-				queue_complete_handler : queueComplete	// Queue plugin event
-			};
 
-			swfu = new SWFUpload(settings);
-	     };
+		
 	</script>
 
 
@@ -92,6 +87,10 @@ table.DTFC_Cloned thead,table.DTFC_Cloned tfoot{background-color:white}div.DTFC_
 				<!-- if empty({{receiptDetail}})||(!({{receiptDetail.status}}==8||{{receiptDetail.status}}==9)) -->
 				<form action="/invoiceTrainingDetail/{{itid}}.html" id="its" method="get" class="nice-validator n-default" novalidate="novalidate">
 					<ul class="cateList">
+					<li>
+						<a href="/invoiceTrainingDetail/{{itid}}.html" class="now" data-toggle="modal">纸质发票</a>
+						<a href="/invoiceTrainingElectronicDetail/{{itid}}.html" data-toggle="modal">电子发票</a>
+						</li>
 						<li>
 						<select name="trainStatus" node-itSChange >
 							<option <!-- if {{trainStatus}}=='ALL' --> selected <!-- endif --> value="ALL">所有 </option>
@@ -131,6 +130,8 @@ table.DTFC_Cloned thead,table.DTFC_Cloned tfoot{background-color:white}div.DTFC_
 							<th>邮寄物品</th>
 							<th>邮寄地址</th>
 							
+							
+							
 							<th>注册地址、电话</th>
 							<th>开户银行及账号</th>
 							<th>开票内容</th>
@@ -488,11 +489,11 @@ table.DTFC_Cloned thead,table.DTFC_Cloned tfoot{background-color:white}div.DTFC_
 							<tr><th class="taC" width="150">选择Excel文件</th>
 							<td>
 							
-						<div class="controls">
-			            	<span id="spanButtonPlaceHolder"></span>	
-							<input id="btnCancel" type="button" value="取消所有上传" style="display:none"  onclick="swfu.cancelQueue();" disabled="disabled" style="margin-left: 2px; font-size: 8pt; height: 29px;" />			
-			            </div>
-						<span class="fieldset flash" id="fsUploadProgress"></span>
+							<input enclosurFile type="file" 
+	  								accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" name="file" />
+							
+							
+						<br/>
 						<span id="divStatus">0 个文件已上传</span>
 							
 							

protected/view/expenses/payments.html

@@ -5,6 +5,7 @@
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
 <script src="<?= WEB_SITE_GLOBAL ?>js/pay.validator.js"></script>
 
+
 <body>
 	<div class="mainLayout">
 		<div class="mainMenu">
@@ -183,7 +184,7 @@
 		</div>
 	</div>
 			
-	<!--弹出日常收支 -->
+			<!--弹出日常收支 -->
 	<div class="modal hide fade" id="saea-detail4">
 		<div class="modal-dialog">
 			<div class="modal-content">
@@ -335,7 +336,7 @@
 								<select name="receivedBank">
 									<option value="纵横广发">纵横广发</option>
 									<option value="个人广发">个人广发</option>
-									<option value="华润银行">华润银行</option>
+									<!-- <option value="华润银行">华润银行</option> -->
 									<option value="纵横工行">纵横工行</option>
 								</select>
 							</td>
@@ -421,7 +422,7 @@
 								<select name="expenditureBank" id="expenditureBank">
 								<option value="纵横广发">纵横广发</option>
 									<option value="个人广发">个人广发</option>
-									<option value="华润银行">华润银行</option>
+									<!-- <option value="华润银行">华润银行</option> -->
 									<option value="纵横工行">纵横工行</option>
 								
 								</select>

protected/view/expenses/wasteBook.html

@@ -32,7 +32,7 @@
 											<td>￥{{waste.bank.ICBCDeposit}}</td>
 										</tr>
 										<tr>
-											<th class="taC">华润存款</th>
+											<th class="taC">纵横广发（其中纵横知道充值金额）</th>
 											<td>￥{{waste.bank.HUADeposit}}</td>
 											<th class="taC">个人存款</th>
 											<td>￥{{waste.bank.PersonalDeposit}}</td>
@@ -40,7 +40,7 @@
 										<tr>
 											<th class="taC">工行理财活期</th>
 											<td>￥{{waste.financial.current.ICBCDeposit}}</td>
-											<th class="taC">工行理财固定</th>
+											<th class="taC">个人理财固定</th>
 											<td>￥{{waste.financial.fixed.ICBCDeposit}}</td>
 										</tr>
 										<tr>

protected/view/mail_create.html

@@ -119,11 +119,7 @@
 							          <table align="center" cellspacing="0" cellpadding="0" style="border:1px solid #ddd;">
 							           <tbody>
 							            <tr>
-							             <td align="center" style="background-color:#EEF2F5;padding:20px 0 "><a style="text-decoration:none;" href="http://www.teambition.com/" target="_blank"><img width="291px" height="46" src="http://zonghengvideo.qiniudn.com/maillogo1.png"></a></td>
-							            </tr>
-							            
-							            <tr>
-							             <td align="center" style="background-color:#fff;"><img width="640" height="191" src="http://zonghengvideo.qiniudn.com/hero.jpg"></td>
+							             <td align="center" style="background-color:#EEF2F5;padding:20px 0 "><a style="text-decoration:none;" href="https://smartcost.com.cn" target="_blank"><img src="http://d4.smartcost.com.cn/zonghenglogo.png"></a></td>
 							            </tr>
 							            <tr>
 							             <td align="left" style="background-color:#fff;padding:40px;border-bottom:1px solid #ddd;">
@@ -176,10 +172,10 @@
 				          <table align="center" cellspacing="0" cellpadding="0" style="border:1px solid #ccc;width:100%;border-top:none">
 				           <tbody>
 				            <tr>
-				             <td align="right" style="background:#fff url('http://zonghengvideo.qiniudn.com/mail3-top-bg.png') no-repeat top center;padding:30px 20px 20px 20px;border-bottom:1px solid #E9EBE2;">
+				             <td align="right" style="background:#fff;padding:30px 20px 20px 20px;border-bottom:1px solid #E9EBE2;">
 				             	<div style="position:relative;text-align:right">
 				              <b style="font-size:24px;color:#8A9F98;z-index:999"><span name="titleHtml">邮件标题</span></b>
-				              <div style="width:80px;height:80px;position:absolute;top:0;left:0"><img src="http://zonghengvideo.qiniudn.com/zonghenglogo.png"></div>
+				              <div style="width:80px;height:80px;position:absolute;top:0;left:0"><img src="http://d4.smartcost.com.cn/zonghenglogo.png"></div>
 				              </div>
 				             </td>
 				            </tr>
@@ -257,7 +253,7 @@
 				      </td>
 				    </tr><tr><td><table align="center" style="width:640px;margin-bottom:60px;position:relative">
 				            <tbody><tr>
-				             <td align="center" style="padding:20px 0;position:absolute;left:50%;margin-left:-40px;bottom:115px"><a style="text-decoration:none;" href="http://www.teambition.com/" target="_blank"><img width="80px" height="80" src="http://zonghengvideo.qiniudn.com/zonghenglogo.png"></a></td>
+				             <td align="center" style="padding:20px 0;position:absolute;left:50%;margin-left:-40px;bottom:115px"><a style="text-decoration:none;" href="https://smartcost.com.cn" target="_blank"><img width="80px" height="80" src="http://zonghengvideo.qiniudn.com/zonghenglogo.png"></a></td>
 				            </tr>
 				      	        <tr>
 				             <td style="padding: 10px 0 0;background:#F6F6F6;">

protected/view/receipt/receiptWasteBook.html

@@ -204,7 +204,7 @@ $('select[expensesType]').change(function() {
 								<select name="expenditureBank" id="expenditureBank">
 									<option value="CGBDeposit">纵横广发</option>
 									<option value="ICBCDeposit">纵横工行</option>
-									<option value="HUADeposit">华润银行</option>
+									<!-- <option value="HUADeposit">华润银行</option> -->
 									<option value="PersonalDeposit">个人广发</option>
 									</select>
 								
@@ -231,7 +231,7 @@ $('select[expensesType]').change(function() {
 								<select name="receivedBank" id="receivedBank">
 									<option value="CGBDeposit">纵横广发</option>
 									<option value="ICBCDeposit">纵横工行</option>
-									<option value="HUADeposit">华润银行</option>
+									<!-- <option value="HUADeposit">华润银行</option> -->
 									<option value="PersonalDeposit">个人广发</option>
 									</select>
 							</td>