1

global/js/humanResource.js

@@ -345,7 +345,7 @@ $(function() {
 						cateDepart+="/"+data.detail.department.departmentName;
 					$("#DimissionCategory").html(cateDepart);
 					
-					$("#DimissionPosition").html(data.detail.position);
+					$("#DimissionPosition").html(data.detail.positionDetail.positionName);
 					$("#DimissionHiredate").html(data.detail.hiredate);
 					$("#DimissionHiredate2").html(' 已入职 '+data.detail.workforce+' 天');
 					$("#applyLeaveDate2").val(data.detail.applyLeaveDate);

global/js/payments.js

@@ -15,6 +15,7 @@ $(function() {
 	
 	$('select[node-accountTypeSelect]').change(function() {
 		 var payVal=$(this).val();
+		$('tr[node-incomeBank]').show();
 		 if(payVal=="1"){
 			 $('div[node-accountMsg1]').show();
 			 $('div[node-accountMsg2]').hide();
@@ -45,6 +46,9 @@ $(function() {
 			 $('div[node-accountMsg4]').hide();
 			 $('div[node-accountMsg7]').hide();
 			 $('div[node-accountMsg9]').show();
+		 }else if(payVal=="11"||payVal=="12"){
+			 $('tr[node-incomeBank]').hide();
+
 		 }else{
 			 $('div[node-accountMsg1]').hide();
 			 $('div[node-accountMsg2]').hide();
@@ -56,7 +60,7 @@ $(function() {
 	
 	$('select[node-expenditureTypeSelect]').change(function() {
 		 var payVal=$(this).val();
-		
+		$('tr[node-expenditureBank]').show();
 		 if(payVal=="3"){
 			 $('div[node-expenditureMsg3]').show();
 			 $('div[node-expenditureMsg4]').hide();
@@ -69,6 +73,8 @@ $(function() {
 			 $('div[node-expenditureMsg3]').hide();
 			 $('div[node-expenditureMsg4]').hide();
 			 $('div[node-expenditureMsg6]').show();
+		 }else if(payVal=="8"||payVal=="9"){
+			 $('tr[node-expenditureBank]').hide();
 		 }else{
 			 $('div[node-expenditureMsg3]').hide();
 			 $('div[node-expenditureMsg4]').hide();

protected/config/acl.conf.php

@@ -478,6 +478,7 @@ $acl ['RECEIPTS'] ['allow'] = array (
 				
 				'receiptFeeDiversion',
 				'feeAgency',
+				'feeTravel',
 				
 				'h5Upload',
 				'receiptTrainDo',

protected/config/js.edition.conf.php

@@ -5,7 +5,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 ( "payments", WEB_SITE_GLOBAL.'js/payments.js?1.03' );
 define ( "invoiceValidator", WEB_SITE_GLOBAL.'js/invoice.validator.js?1.02' );
 
 define ( "autoTag", WEB_SITE_GLOBAL.'js/autoTag.js?1' );

protected/config/routes.conf.php

@@ -148,7 +148,7 @@ $route['*']['/approvalExpenses/:status'] = array('ReceiptController', 'approvalE
 //费用报销单-分细小类
 $route['*']['/receiptFeeDiversion'] = array('ReceiptController', 'receiptFeeDiversion');
 $route['*']['/receipt/feeAgency'] = array('ReceiptController', 'feeAgency');
-
+$route['*']['/receipt/feeTravel'] = array('ReceiptController', 'feeTravel');
 //审批请求
 $route['*']['/expensesEdi/:rid'] = array('ReceiptController', 'expensesEdi');
 $route['*']['/expensesDefray'] = array('ReceiptController', 'expensesDefray');

protected/config/wasteBook.conf.php

@@ -3,8 +3,8 @@
 $waste['total']=0;
 //存款部分
 $waste ['bank'] = array (
-		'CGBDeposit' => 708202.03,   //广发存款
-		'ICBCDeposit' => 588829.12,      //工行存款
+		'CGBDeposit' => 10000,   //广发存款
+		'ICBCDeposit' => 588829.12,  //工行存款
 		'HUADeposit' => 161441.20,	//纵横广发（其中纵横知道充值金额）
 		'PersonalDeposit' => 93850.16, //个人存款
 );

protected/controller/InvoiceController.php

@@ -7463,13 +7463,9 @@ class InvoiceController extends DooController {
 							<th class="taC" width="150">收件人手机</th><td>'.$detail ['electronicPhone'].'</td>
 							<th class="taC" width="150">收件人邮箱</th><td>'.$detail ['electronicEmail'].'</td>
 						</tr></tbody></table>';
-						
-					if ($detail ['expressCom'] == 'SF')
-						$html .= '<tr><th class="taC" width="150">快递单号</th><td colspan="3">' . $detail ['expressCompany'] . ' <a target="_blank" href="http://www.sf-express.com/cn/sc/dynamic_function/waybill/#search/bill-number/">' . $detail ['expressNumber'] . '</a> </td></tr>';
-						else
-							$html .= '<tr><th class="taC" width="150">快递单号</th><td colspan="3">' . $detail ['expressCompany'] . ' <a target="_blank" href="/invoiceExpress/' . $detail ['expressCom'] . '/' . $detail ['expressNumber'] . '.html">' . $detail ['expressNumber'] . '</a> </td></tr>';
-							$html .= '</tbody></table>';
-				}
+				}	
+					
+				
 				
 				
 				if (! empty ( $invoiceOperationLogList )) {

protected/controller/MainController.php

@@ -3381,10 +3381,10 @@ class MainController extends DooController {
 		
 		
 		$staffCondition = "";
-		if ($this->staff [0] ['cid'] != 12){
-			$staffCondition = " and cid=" . $this->staff [0] ['cid'];
-			$cid=$this->staff [0] ['cid'];
-		}else{
+// 		if ($this->staff [0] ['cid'] != 12){
+// 			$staffCondition = " and cid=" . $this->staff [0] ['cid'];
+// 			$cid=$this->staff [0] ['cid'];
+// 		}else{
 			$cid=$this->staff [0] ['cid'];
 			if (!empty($cidKey)){
 				$cid = $XDeode->decode ( $cidKey );
@@ -3393,7 +3393,7 @@ class MainController extends DooController {
 				}
 			}
 			$staffCondition = " and cid=" . $cid;
-		}
+		//}
 		
 		$staffList = $staff->find ( array (
 				'where' => "isadmin= 0 and nature !=4  " . $staffCondition,

protected/model/accountBook.php

@@ -135,7 +135,11 @@ class accountBook extends DooModel {
 			$Detail['expenditureTypeMsg']='工行理财';
 		}elseif($Detail ['expenditureType']==7){
 			$Detail['expenditureTypeMsg']='理财支出';
-		}
+		}elseif($Detail ['expenditureType']==8){
+            $Detail['expenditureTypeMsg']='广发存款';
+        }elseif($Detail ['expenditureType']==9){
+            $Detail['expenditureTypeMsg']='工行存款';
+        }
 		
 		$Detail['incomeTypeMsg']='';
 		if($Detail ['accountType']==1){
@@ -158,7 +162,11 @@ class accountBook extends DooModel {
 			$Detail['incomeTypeMsg']='工行理财';
 		}elseif($Detail ['accountType']==10){
 			$Detail['incomeTypeMsg']='理财收入';
-		}
+		}elseif($Detail ['accountType']==11){
+            $Detail['incomeTypeMsg']='广发存款';
+        }elseif($Detail ['accountType']==12){
+            $Detail['incomeTypeMsg']='工行存款';
+        }
 		
 		$Detail['staffDetail']=$staff->getStaffBySid($Detail['inputStaff']);
 		

protected/model/receipt.php

@@ -39,6 +39,8 @@ class receipt extends DooModel {
 	public $invoiceTrainId;
 	public $paidStatus;
 	public $statusTrain;
+	public $receiptClass;
+	public $itinerary;
 
 	public $_table = 'CLD_receipt';
 	public $_primarykey = 'rid';
@@ -80,7 +82,9 @@ class receipt extends DooModel {
 			'trainLoanRid',
 			'invoiceTrainId' ,
             'paidStatus',
-			'statusTrain'
+			'statusTrain',
+			'receiptClass',
+			'itinerary',
 	);
 
 	

protected/view/admin/invoiceEdit.html

@@ -2,7 +2,7 @@
 <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="<?= invoiceValidator ?>"></script>
 
 <script>
 $(function() {
@@ -268,7 +268,7 @@ $('input[type=radio][name=invoiceForm]').change(function() {
 								</tr>
 								<tr>
 									<th class="taC" width="150">收件人手机</th>
-									<td><input class="contact" type="text"  name="electronicPhone" id="electronicPhone" value="{{invoiceDetail.electronicPhone}}" placeholder="手机号"
+									<td><input class="contact" type="text"  name="electronicPhone" id="electronicPhone" <!-- if empty({{invoiceDetail.electronicPhone}}) --> value="1" <!-- else --> value="{{invoiceDetail.electronicPhone}}" <!-- endif -->  placeholder="手机号"
 									data-rule="required(from, .contact); digits" data-msg-required="请至少填写一种联系方式">
 									</td>
 								</tr>

protected/view/admin/staffCollectMonthDetail.html

@@ -39,7 +39,7 @@
 	  					</select> 	
 	
 	
-	<a target="_blank" href="/staffCollectMonthDetail2/{{year}}/{{month}}">导出</a></li>
+	</li>
 	  					<li><b>{{month}}月</b>报销总计：￥{{stList.rePrice}}</li>
 	  					<li><b>{{month}}月</b>同意支付：<span class="colGreen">￥{{stList.agPrice}}</span></li>
 	  					<li><b>{{month}}月</b>审批中：￥{{stList.skPrice}}</li>

protected/view/expenses/payments.html

@@ -1,5 +1,5 @@
 <!-- include '../header' -->
-<script src="<?= WEB_SITE_GLOBAL ?>js/payments.js"></script>
+<script src="<?= payments ?>"></script>
 <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>
@@ -70,6 +70,10 @@
 												广发理财
 												<!-- elseif {{list' value.accountType}}==9 -->
 												工行理财
+												<!-- elseif {{list' value.accountType}}==11 -->
+												广发存款
+												<!-- elseif {{list' value.accountType}}==12 -->
+												工行存款
 												<!-- elseif {{list' value.accountType}}==8 -->
 												保证金
 												<!-- elseif {{list' value.accountType}}==10 -->
@@ -100,6 +104,10 @@
 											广发理财
 											<!-- elseif {{list' value.expenditureType}}==6 -->
 											工行理财
+											<!-- elseif {{list' value.expenditureType}}==8 -->
+												广发存款
+											<!-- elseif {{list' value.expenditureType}}==9 -->
+												工行存款
 											<!-- elseif {{list' value.expenditureType}}==5 -->
 											保证金
 											<!-- elseif {{list' value.expenditureType}}==7 -->
@@ -281,7 +289,11 @@
 								
 								<option value='7'>广发理财</option>
 								<option value='9'>工行理财</option>
-								
+
+								<option value='11'>广发存款</option>
+								<option value='12'>工行存款</option>
+
+
 								<option value='8'>保证金</option>
 							</select>
 							<p>
@@ -330,13 +342,13 @@
 						<tr>
 							<th class="taC">到款信息</th><td><input name="receivedMsg" id="receivedMsg"  value="" type="text"></td>
 						</tr>
-						<tr>
+						<tr node-incomeBank>
 							<th class="taC">到款银行</th>
 							<td>
 								<select name="receivedBank">
 									<option value="纵横广发">纵横广发</option>
 									<option value="个人广发">个人广发</option>
-									<!-- <option value="华润银行">华润银行</option> -->
+									<option value="华润银行">（广发）纵横知道</option>
 									<option value="纵横工行">纵横工行</option>
 								</select>
 							</td>
@@ -381,7 +393,11 @@
 								
 								<option value='4'>广发理财</option>
 								<option value='6'>工行理财</option>
-								
+
+								<option value='8'>广发存款</option>
+								<option value='9'>工行存款</option>
+
+
 								<option value="5">保证金</option>
 							</select>
 							<!--缴税 二级-->
@@ -416,13 +432,13 @@
 							<th class="taC">支出金额</th><td>
 							<input name="expenditurePrice" id="expenditurePrice"   value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
 						</tr>
-						<tr>
+						<tr node-expenditureBank>
 							<th class="taC">支出银行</th>
 							<td>
 								<select name="expenditureBank" id="expenditureBank">
 								<option value="纵横广发">纵横广发</option>
 									<option value="个人广发">个人广发</option>
-									<!-- <option value="华润银行">华润银行</option> -->
+									<option value="华润银行">（广发）纵横知道</option>
 									<option value="纵横工行">纵横工行</option>
 								
 								</select>

protected/view/expenses/paymentsAchieve.html

@@ -8,7 +8,7 @@
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
 <script src="<?= WEB_SITE_GLOBAL ?>js/pay.validator.js"></script>
 
-<script src="<?= WEB_SITE_GLOBAL ?>js/payments.js"></script>
+<script src="<?= payments ?>"></script>
 
 <body>
 	<div class="mainLayout">
@@ -55,6 +55,9 @@
 								<option <!-- if {{accountType}}=='7' --> selected <!-- endif --> value='7'>广发理财</option>
 								<option <!-- if {{accountType}}=='9' --> selected <!-- endif --> value='9'>工行理财</option>
 								<option <!-- if {{accountType}}=='8' --> selected <!-- endif --> value='8'>保证金</option>
+
+								<option <!-- if {{accountType}}=='11' --> selected <!-- endif --> value='11'>广发存款</option>
+								<option <!-- if {{accountType}}=='12' --> selected <!-- endif --> value='12'>工行存款</option>
 							</select>
 							<!--利息收入 二级-->
 							<span node-accountMsg1  <!-- if {{accountType}}!='1' --> style="display:none;" <!-- endif --> >
@@ -106,6 +109,9 @@
 								<option <!-- if {{expenditureType}}=='4' --> selected <!-- endif --> value="4">广发理财</option>
 								<option <!-- if {{expenditureType}}=='6' --> selected <!-- endif --> value="4">工行理财</option>
 								<option <!-- if {{expenditureType}}=='5' --> selected <!-- endif --> value='5'>保证金</option>
+
+							<option <!-- if {{expenditureType}}=='6' --> selected <!-- endif --> value="8">广发存款</option>
+							<option <!-- if {{expenditureType}}=='5' --> selected <!-- endif --> value='9'>工行存款</option>
 							</select>
 						
 						<!-- endif -->
@@ -163,6 +169,10 @@
 												保证金
 												<!-- elseif {{list' value.accountType}}==10 -->
 												理财收入
+									<!-- elseif {{list' value.accountType}}==11 -->
+									广发存款
+									<!-- elseif {{list' value.accountType}}==12 -->
+									工行存款
 												<!-- endif -->
 								<!-- if {{list' value.accountMsg}}!='' -->				
 								/ {{list' value.accountMsg}}				
@@ -197,6 +207,10 @@
 											保证金
 											<!-- elseif {{list' value.expenditureType}}==7 -->
 											理财支出
+									<!-- elseif {{list' value.expenditureType}}==8 -->
+									广发存款
+									<!-- elseif {{list' value.expenditureType}}==9 -->
+									工行存款
 											<!-- endif -->
 								<!-- if {{list' value.expenditureMsg}}!='' -->				
 								/ {{list' value.expenditureMsg}}				

protected/view/expenses/wasteBook.html

@@ -25,18 +25,25 @@
 							<div class="clearfix">
 								<table class="table table-bordered table-condensed">
 									<tbody>
+									
+									<tr>
+                                            <th class="taC">（纵横广发）广发存款</th>
+                                            <td>￥{{waste.bank.CGBDeposit}}</td>
+                                            <th class="taC">（纵横广发）纵横知道款</th>
+                                            <td>￥{{waste.bank.HUADeposit}}</td>
+                                        </tr>
+									
+									<tr>
+                                            <th colspan="4" class="taC">公司广发合计存款：￥{{CGBDeposit_total}}</th>
+                                        </tr>
+									
 										<tr>
-											<th class="taC">广发存款</th>
-											<td>￥{{waste.bank.CGBDeposit}}</td>
 											<th class="taC">工行存款</th>
 											<td>￥{{waste.bank.ICBCDeposit}}</td>
-										</tr>
-										<tr>
-											<th class="taC">纵横广发（其中纵横知道充值金额）</th>
-											<td>￥{{waste.bank.HUADeposit}}</td>
 											<th class="taC">个人存款</th>
 											<td>￥{{waste.bank.PersonalDeposit}}</td>
 										</tr>
+										
 										<tr>
 											<th class="taC">工行理财活期</th>
 											<td>￥{{waste.financial.current.ICBCDeposit}}</td>

protected/view/humanResource/hrEmployee.html

@@ -1,5 +1,5 @@
 <!-- include '../header' -->
-<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>/js/humanResource.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>/js/humanResource.js?v=1.01"></script>
 <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>

protected/view/lock_count.html

@@ -34,7 +34,7 @@ $('select[fnCidData]').change(function() {
 			</div>
 			
 	  		<div class="lockDatabase fL autoHeight">
-	  		<!-- if {{staff.0.cid}}==12 -->
+	  	
 	  		<form  id="statistics" action="/statistics" method="get" >
 	  		<select  name="cidKey" fnCidData >
 	  					<!-- loop category -->
@@ -42,7 +42,7 @@ $('select[fnCidData]').change(function() {
 	  					<!-- endloop -->
 	  					</select>
 	  					</form>
-	  					<!-- endif -->
+	  					
 	  			<table class="table table-bordered table-condensed table-hover" style="margin:5px">
 					<thead>
 					<tr>