Explorar el Código

报销单 汇款信息

caipin hace 7 años
padre
commit
3df7fc1355

+ 6 - 1
global/js/receipt.js

@@ -469,7 +469,12 @@ $(function() {
 	    theme:"yellow_top",
 	    fields: {
 	        'verify': 'required; ',
-	        'explanation':'required; '
+	        'explanation':'required; ',
+	        
+	        'remittanceName':'required; ',
+	        'bankName':'required; ',
+	        'bankNumber':'required; '
+	        
 	    }
 	});
 	

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 463 - 494
protected/controller/MainController.php


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 113 - 35
protected/controller/ReceiptController.php


+ 8 - 1
protected/model/receipt.php

@@ -43,13 +43,20 @@ class receipt extends DooModel {
     public $implementOpinions;
     public $notice;
     public $amount;
+    public $remittanceName;
+    public $bankName;
+    public $bankNumber;
+    public $coupletNumber;
     
     public $_table = 'CLD_receipt';
     public $_primarykey = 'rid';
     
     public $_fields = array('aid', 'accountItem', 'staff', 'sum', 'date','pastDate' ,'cid', 'status', 'reviseDetail', 'revisePrice', 'verify','verifyStaff',
     'nowStaff','receiptOrder','explanation','notice','Rtype','loanItem','loanRid','loanSum','implementOpinions','isBK','executeCopy','executeStaff','verifyBreakup','executeDate'
-    		,'amount','loanDate');
+    		,'amount','loanDate','remittanceName',
+			'bankName',
+			'bankNumber',
+			'coupletNumber');
 
 	function receiptByYear($dateCondition,$sid){
     	//

+ 9 - 1
protected/model/staff.php

@@ -21,6 +21,10 @@ class staff extends DooModel {
 	public $hiredate;
 	public $wxid;
 	public $nature;
+	public $remittanceName;
+	public $bankName;
+	public $bankNumber;
+	public $coupletNumber;
 	public $_table = 'CLD_staff';
 	public $_primarykey = 'sid';
 	public $_fields = array (
@@ -43,7 +47,11 @@ class staff extends DooModel {
 			'avatar',
 			'hiredate',
 			'wxid',
-			'nature' 
+			'nature',
+			'remittanceName',
+			'bankName',
+			'bankNumber',
+			'coupletNumber'
 	);
 	public function checkUser($uid, $passwork) {
 		return $this->find ( array (

+ 30 - 0
protected/view/admin/admin_myinfo.html

@@ -168,6 +168,36 @@
 <div class="controls"><input type="text" name="qq"
 	value="{{staff.0.qq}}"></div>
 </div>
+
+
+
+<legend>汇款信息</legend>
+					<div class="control-group">
+						<label class="control-label">汇款人户名</label>
+						<div class="controls">
+							<input type="text" name="remittanceName" value="{{staff.0.remittanceName}}">
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="control-label">汇款开户银行名称</label>
+						<div class="controls">
+							<input type="text" name="bankName" value="{{staff.0.bankName}}">
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="control-label">汇款帐号</label>
+						<div class="controls">
+							<input type="text" name="bankNumber" value="{{staff.0.bankNumber}}">
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="control-label">联行号&nbsp;&nbsp;<span class="colRed">(如果不是公司广发,务必填上银行联行号)</span></label>
+						<div class="controls">
+							<input type="text" name="coupletNumber" value="{{staff.0.coupletNumber}}">
+						</div>
+					</div>
+
+
 <legend>修改密码</legend>
 <div class="control-group"><label for="inputEmail"
 	class="control-label">旧密码</label>

+ 7 - 0
protected/view/admin/hisImplement.html

@@ -51,6 +51,13 @@
 		  					</select>
 						</li>
 						
+						<li>
+							<select  id="S" onchange="receiptSop();">
+		  					<option value="SOP" <!-- if {{sop}}=='SOP' --> selected <!-- endif --> >所有</option>
+		  					{{sopHtml}}
+		  					</select>
+						</li>
+						
 						
 						
 						

+ 15 - 0
protected/view/admin/remitAdd.html

@@ -137,6 +137,21 @@
 								</td>
 							</tr>
 	  						
+	  						
+	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
+							<tr><th>汇款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="" placeholder="请输入汇款人户名" ></td>
+							</tr>
+							<tr><th>汇款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="" placeholder="请输入汇款开户银行名称" >
+							</td></tr>
+							<tr><th>汇款帐号</th><td>
+							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="">
+							</td></tr>
+							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">(如果不是公司广发,务必填上银行联行号)</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="">
+							</td></tr>
+	  						
 	  						<tr><th colspan="2" class="taC">对公汇款说明</th></tr>
 	  						<tr><th colspan="2">
 	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="正确填写收款单位的名称、开户行、账号;详细填写费用用途。"></textarea>

+ 17 - 3
protected/view/admin/remitEdit.html

@@ -27,7 +27,7 @@
 					progressTarget : "fsUploadProgress",
 					cancelButtonId : "btnCancel"
 				},
-				debug: true,
+				debug: false,
 
 				// Button settings
 				button_image_url: "<?= WEB_SITE_GLOBAL ?>js/swfuplad2/TestImageNoText_65x29.png",	// Relative to the Flash file
@@ -82,8 +82,8 @@
 	  				<input type="hidden" id="travelR" value="{{cSum.travelSum}}" />
 	  				<input type="hidden" id="trainR" value="{{cSum.trainSum}}" />
 	  				<input type="hidden" id="otherR" value="{{cSum.otherSum}}" />
-	  				<form action="/remitEdiDo" method="post">
-	  					<input type="hidden" name="rid" value="{{rid}}"/>
+	  				<form action="/remitEdiDo" name="recepitAdd" method="post">
+	  					<input type="hidden" name="rid" value="{{ridKey}}"/>
 	  					<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
 	  					   
@@ -139,6 +139,20 @@
 							</tr>
 	  						
 	  						
+	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
+							<tr><th>汇款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入汇款人户名" ></td>
+							</tr>
+							<tr><th>汇款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入汇款开户银行名称" >
+							</td></tr>
+							<tr><th>汇款帐号</th><td>
+							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
+							</td></tr>
+							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">(如果不是公司广发,务必填上银行联行号)</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
+							</td></tr>
+	  						
 	  							
 	  						
 	  						

+ 17 - 0
protected/view/admin/saeaLoanAdd.html

@@ -60,6 +60,23 @@
 								</select>
 								</td>
 							</tr>
+							
+							<tr><th colspan="2" class="taC">汇款信息</th></tr>
+							<tr><th>汇款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{staff.0.remittanceName}}" placeholder="请输入汇款人户名" ></td>
+							</tr>
+							<tr><th>汇款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{staff.0.bankName}}" placeholder="请输入汇款开户银行名称" >
+							</td></tr>
+							<tr><th>汇款帐号</th><td>
+							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="{{staff.0.bankNumber}}">
+							</td></tr>
+							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">(如果不是公司广发,务必填上银行联行号)</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{staff.0.coupletNumber}}">
+							</td></tr>
+							
+							
+							
 	  						<tr><th colspan="2" class="taC">借款说明</th></tr>
 	  						<tr><th colspan="2">
 	  									<textarea name='explanation' id="explanation" required rows="2" style="width:99%" placeholder="请详细填写借款(备用金)用途。"></textarea>

+ 21 - 13
protected/view/admin/saeaLoanAddReceipt.html

@@ -1,4 +1,7 @@
  <!-- 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/receipt.js"></script>
 
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/swfupload.js"></script>
@@ -74,18 +77,10 @@
 			<div class="adminContent autoHeight" style="height: 821px;">
 				<legend><div class="fR"></div>借款报销费用详情</legend>
 				
-				
-				
-				
-				
 				<div class="saeaList ">
 	  			<!-- loop receiptList -->
 	  			<div class="entry loan-list">
 	  				
-	  				
-	  				
-	  				
-	  			
 	  			<div class="seTable">
 						<table class="table table-bordered table-condensed table-hover">
 							<tbody>
@@ -107,10 +102,6 @@
 						</table>
 					</div>
 	  			
-	  			
-	  			
-	  			
-	  				
 	  				<div class="seCensor loan-censor">
 	  					
 	  				
@@ -168,7 +159,7 @@
 	  			<div class="entry  loan-list">
 	  				<div class="seTable">
 	  				
-	  				<form action="/saeaLoanReceiptAddDo" method="post">
+	  				<form action="/saeaLoanReceiptAddDo" name="recepitAdd" method="post">
 	  				<input type="hidden" id="agencyR" value="0" />
 	  				<input type="hidden" id="travelR" value="0" />
 	  				<input type="hidden" id="trainR" value="0" />
@@ -257,6 +248,23 @@
 								</td>
 							</tr>
 	  						
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
+							<tr><th>汇款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入汇款人户名" ></td>
+							</tr>
+							<tr><th>汇款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入汇款开户银行名称" >
+							</td></tr>
+							<tr><th>汇款帐号</th><td>
+							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
+							</td></tr>
+							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">(如果不是公司广发,务必填上银行联行号)</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
+							</td></tr>
+	  						
+	  						
 	  						<tr><th colspan="2" class="taC">报销说明</th></tr>
 	  						<tr><th colspan="2">
 	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="市内交通费、邮寄费、公关费、办公费等费用说明,请详细填写在这。"></textarea>

+ 22 - 3
protected/view/admin/saeaLoanEdi.html

@@ -1,5 +1,7 @@
 <!-- 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/receipt.js"></script>
 
 <body>
@@ -21,8 +23,8 @@
 			<div class="adminContent autoHeight" style="height: 821px;">
 				<legend><div class="fR"></div>申请借款</legend>
 	  		<div class="saeaList">
-	  		<form action="/saeaLoanEdiDo" method="post">
-	  			<input type="hidden" name="rid" value="{{receiptInfo.rid}}">
+	  		<form action="/saeaLoanEdiDo" name="recepitAdd" method="post">
+	  			<input type="hidden" name="rid" value="{{ridKey}}">
 	  			<div class="entry loan-list">
 	  				<div class="seTable">
 	  					<table class="table table-bordered table-condensed table-hover">
@@ -64,6 +66,23 @@
 								</select>
 								</td>
 							</tr>
+							
+							
+							<tr><th colspan="2" class="taC">汇款信息</th></tr>
+							<tr><th>汇款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptInfo.remittanceName}}" placeholder="请输入汇款人户名" ></td>
+							</tr>
+							<tr><th>汇款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{receiptInfo.bankName}}" placeholder="请输入汇款开户银行名称" >
+							</td></tr>
+							<tr><th>汇款帐号</th><td>
+							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="{{receiptInfo.bankNumber}}">
+							</td></tr>
+							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">(如果不是公司广发,务必填上银行联行号)</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptInfo.coupletNumber}}">
+							</td></tr>
+							
+							
 	  						<tr><th colspan="2" class="taC">借款说明</th></tr>
 	  						<tr><th colspan="2">
 	  									<textarea name='explanation' id="explanation" required rows="2" style="width:99%" placeholder="借款说明天填写在此。">{{receiptInfo.explanation}}</textarea>

+ 19 - 2
protected/view/admin/saeaLoanEdiReceipt.html

@@ -1,4 +1,7 @@
  <!-- 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/receipt.js"></script>
 <body>
 	<div class="mainLayout">
@@ -125,8 +128,8 @@
 	  				<input type="hidden" id="travelR" value="{{cSum.travelSum}}" />
 	  				<input type="hidden" id="trainR" value="{{cSum.trainSum}}" />
 	  				<input type="hidden" id="otherR" value="{{cSum.otherSum}}" />
-	  				<form action="/updateReceipt" method="post">
-	  					<input type="hidden" name="rid" value="{{rid}}"/>
+	  				<form action="/updateReceipt" name="recepitAdd" method="post">
+	  					<input type="hidden" name="rid" value="{{ridKey}}"/>
 	  					<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
 	  					   
@@ -207,6 +210,20 @@
 							</tr>	
 	  						
 	  						
+	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
+							<tr><th>汇款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入汇款人户名" ></td>
+							</tr>
+							<tr><th>汇款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入汇款开户银行名称" >
+							</td></tr>
+							<tr><th>汇款帐号</th><td>
+							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
+							</td></tr>
+							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">(如果不是公司广发,务必填上银行联行号)</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
+							</td></tr>
+	  						
 	  						<tr><th colspan="2" class="taC">报销说明</th></tr>
 	  						<tr><th colspan="2">
 	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="市内交通费、邮寄费、公关费、办公费等费用说明,请详细填写在这。">{{receiptDetail.explanation}}</textarea>

+ 16 - 2
protected/view/admin/saea_create.html

@@ -11,7 +11,6 @@
 
 <script type="text/javascript">
 		var swfu;
-
 		window.onload = function() {
 			var settings = {
 				flash_url : "<?= WEB_SITE_GLOBAL ?>js/swfuplad2/swfupload.swf",
@@ -26,7 +25,7 @@
 					progressTarget : "fsUploadProgress",
 					cancelButtonId : "btnCancel"
 				},
-				debug: true,
+				debug: false,
 
 				// Button settings
 				button_image_url: "<?= WEB_SITE_GLOBAL ?>js/swfuplad2/TestImageNoText_65x29.png",	// Relative to the Flash file
@@ -160,6 +159,21 @@
 								</td>
 							</tr>
 	  						
+	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
+							<tr><th>汇款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{staff.0.remittanceName}}" placeholder="请输入汇款人户名" ></td>
+							</tr>
+							<tr><th>汇款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{staff.0.bankName}}" placeholder="请输入汇款开户银行名称" >
+							</td></tr>
+							<tr><th>汇款帐号</th><td>
+							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="{{staff.0.bankNumber}}">
+							</td></tr>
+							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">(如果不是公司广发,务必填上银行联行号)</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{staff.0.coupletNumber}}">
+							</td></tr>
+	  						
+	  						
 	  						<tr><th colspan="2" class="taC">报销说明</th></tr>
 	  						<tr><th colspan="2">
 	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="市内交通费、邮寄费、公关费、办公费等费用说明,请详细填写在这。"></textarea>

+ 16 - 4
protected/view/admin/saea_edit.html

@@ -4,8 +4,6 @@
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
  <script src="<?= WEB_SITE_GLOBAL ?>js/receipt.js"></script>
  
- 
- 
 <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>
@@ -28,7 +26,7 @@
 					progressTarget : "fsUploadProgress",
 					cancelButtonId : "btnCancel"
 				},
-				debug: true,
+				debug: false,
 
 				// Button settings
 				button_image_url: "<?= WEB_SITE_GLOBAL ?>js/swfuplad2/TestImageNoText_65x29.png",	// Relative to the Flash file
@@ -84,7 +82,7 @@
 	  				<input type="hidden" id="travelR" value="{{cSum.travelSum}}" />
 	  				<input type="hidden" id="trainR" value="{{cSum.trainSum}}" />
 	  				<input type="hidden" id="otherR" value="{{cSum.otherSum}}" />
-	  				<form action="/updateReceipt" method="post">
+	  				<form action="/updateReceipt" name="recepitAdd" method="post">
 	  					<input type="hidden" name="rid" value="{{rid}}"/>
 	  					<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
@@ -164,6 +162,20 @@
 							</tr>		
 	  						
 	  						
+	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
+							<tr><th>汇款人户名</th>
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入汇款人户名" ></td>
+							</tr>
+							<tr><th>汇款开户银行名称</th><td>
+							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入汇款开户银行名称" >
+							</td></tr>
+							<tr><th>汇款帐号</th><td>
+							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
+							</td></tr>
+							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">(如果不是公司广发,务必填上银行联行号)</span></th><td>
+							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
+							</td></tr>
+	  						
 	  						<tr><th colspan="2" class="taC">报销说明</th></tr>
 	  						<tr><th colspan="2">
 	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="市内交通费、邮寄费、公关费、办公费等费用说明,请详细填写在这。">{{receiptDetail.explanation}}</textarea>