日常收支 银行到款时间为流水时间 ok

global/js/payments.js

@@ -3,14 +3,20 @@ $(function() {
 	
 	$('select[node-payMentsSelect]').change(function() {
 		 var payVal=$(this).val();
-		 
+		 $('#INCOMEBox').hide();
+		 $('#EXPENDITUREBox').hide();
+		 $('#FinancialBox').hide();
+		 $('#Bank').hide();
+
 		 if(payVal=="INCOME"){
 			 $('#INCOMEBox').show();
-			 $('#EXPENDITUREBox').hide();
 		 }else if(payVal=="EXPENDITURE"){
-			 $('#INCOMEBox').hide();
 			 $('#EXPENDITUREBox').show();
-		 }
+		 }else if(payVal=="FinancialBox"){
+			$('#FinancialBox').show();
+		 }else if(payVal=="Bank"){
+			$('#Bank').show();
+		}
 	});
 	
 	$('select[node-accountTypeSelect]').change(function() {

protected/controller/ReceiptController.php

@@ -469,7 +469,8 @@ class ReceiptController extends DooController {
 		$itineraryObj = new itinerary ();
 		
 		if(empty($itinerary)){
-			return false;
+			header ( 'Content-Type:text/html;charset=utf-8' );
+			die ( '请填写行程单' );
 		}
 		
 		$itineraryJson=json_decode($itinerary,true);
@@ -478,6 +479,10 @@ class ReceiptController extends DooController {
 		foreach ($itineraryJson as $k=>$v){
 			foreach ($v as $kk=>$vv){
 				foreach ($vv as $key=>$value){
+					if(empty($value['departuredate'])||empty($value['arrivalsdate'])){
+						header ( 'Content-Type:text/html;charset=utf-8' );
+						die ( '有行程的日期未设置' );
+					}
 					if($key==0){
 						array_push($itineraryDate, $value['departuredate']);
 						array_push($itineraryDate, substr($value['arrivalsdate'],1));
@@ -505,7 +510,11 @@ class ReceiptController extends DooController {
 // 		}
 // 		array_push($itineraryDate, $this->staff [0] ['sid']);
 // 		$sql=implode(',',$sql);
-			
+		if(empty($sql)){
+			header ( 'Content-Type:text/html;charset=utf-8' );
+			die ( '请填写行程单-2' );
+		}
+		
 		$qualification=array(
 				'where' => 'itineraryDate in ('.$sql.') and sid=? ',
 				'param' => $itineraryDate,
@@ -12215,6 +12224,7 @@ class ReceiptController extends DooController {
 				die ( 'illegal request-bank' );
 
 
+			//TODO -存款功能 提取
 			if($accountType == 11 || $accountType == 12){
 
                 if($accountType == 11){
@@ -12250,34 +12260,6 @@ class ReceiptController extends DooController {
                 );
                 $accountBookStatistics->setAccountBookStatistics ( $item );
 
-                //流水支出
-//                if($accountBank=='CGBDeposit'){
-//                    $dailyExpenditureType='8';
-//                }elseif($accountBank=='ICBCDeposit'){
-//                    $dailyExpenditureType='9';
-//                }elseif($accountBank=='PersonalDeposit'){
-//                    $dailyExpenditureType='10';
-//                }elseif($accountBank=='HUADeposit'){
-//                    $dailyExpenditureType='11';
-//                }
-//
-//                $wasteBook = new wasteBook ();
-//                $itemWaste = array (
-//                    'expensesType' => 2,
-//                    'accountType' => 5,
-//                    'accountPriceShow' => $receivedPrice,
-//                    'accountPrice' => - $receivedPrice,
-//                    'dataID' => $inComeId,
-//                    'dailyExpenditureType' => $dailyExpenditureType,
-//                    'accountBank' => $accountBank,
-//                    'category' => $this->staff [0] ['category'],
-//                    'cid' => $this->staff [0] ['cid'],
-//                    'name' => $this->staff [0] ['username'],
-//                    'sid' => $this->staff [0] ['sid'],
-//                    'inputDate' => date ( "Y-m-d H:i:s" )
-//                );
-//                $wasteBook->setAccountBookStatistics ( $itemWaste );
-
                 // 添加收入流水
                 if($accountType == 11){
                     $accountBank = 'CGBDeposit';
@@ -12297,15 +12279,18 @@ class ReceiptController extends DooController {
                     'cid' => $this->staff [0] ['cid'],
                     'name' => $this->staff [0] ['username'],
                     'sid' => $this->staff [0] ['sid'],
-                    'inputDate' => date ( "Y-m-d H:i:s" )
+					'inputDate' => $receivedDate,
+					'createAt'=>date ( "Y-m-d H:i:s" ),
+					'synPaymentDate'=>1,
                 );
                 $wasteBook->setAccountBookStatistics ( $itemWaste );
 
+			//TODO --移除理财相关
             }elseif($accountType == 7 || $accountType == 9) { // 收入为理财时特殊处理
 				
-				if ($receivedBank == '个人广发') {
-					die ( '个人广发  illegal request' );
-				}
+				// if ($receivedBank == '个人广发') {
+				// 	die ( '个人广发  illegal request' );
+				// }
 				// 添加一条收入
 				$accountBook = new accountBook ();
 				$accountBook->accountType = 10;
@@ -12475,7 +12460,9 @@ class ReceiptController extends DooController {
 						'cid' => $this->staff [0] ['cid'],
 						'name' => $this->staff [0] ['username'],
 						'sid' => $this->staff [0] ['sid'],
-						'inputDate' => date ( "Y-m-d H:i:s" ) 
+						'inputDate' => $receivedDate,
+						'createAt'=>date ( "Y-m-d H:i:s" ),
+						'synPaymentDate'=>1,
 				);
 				$wasteBook->setAccountBookStatistics ( $itemWaste );
 			} else { // 普通日常收入处理
@@ -12536,7 +12523,9 @@ class ReceiptController extends DooController {
 						'cid' => $this->staff [0] ['cid'],
 						'name' => $this->staff [0] ['username'],
 						'sid' => $this->staff [0] ['sid'],
-						'inputDate' => date ( "Y-m-d H:i:s" ) 
+						'inputDate' => $receivedDate,
+						'createAt'=>date ( "Y-m-d H:i:s" ),
+						'synPaymentDate'=>1,
 				);
 				$wasteBook->setAccountBookStatistics ( $itemWaste );
 			}

protected/model/staff.php

@@ -458,12 +458,19 @@ class staff extends DooModel {
 		$position = new position ();
 		foreach ( $list as $key => $value ) {
 			$list [$key] ['sidKey'] = $XDeode->encode ( $value ['sid'] );
-				
-			$list [$key] ['position'] ='';
+			$list [$key] ['position'] =$list[$key]['pendingMan']='';
 			$pdetail=$position->getPositionByPid($value['positionId']);
-			if (!empty($pdetail))
+			if (!empty($pdetail)){
 				$list [$key] ['position'] =$pdetail['positionName'];
-					
+			}
+			if(!empty($value['pendingApprovals'])){
+				$detail=$this->getStaffBySid($value['pendingApprovals']);
+				$list[$key]['pendingMan']=$detail['category'].'-'.$detail['username'].' 审批';
+			}
+			if(!empty($value['pendingApprovalsLeave'])){
+				$detail=$this->getStaffBySid($value['pendingApprovalsLeave']);
+				$list[$key]['pendingMan']=$detail['category'].'-'.$detail['username'].' 审批';
+			}
 		}
 		
 		return $list;

protected/view/expenses/payments.html

@@ -246,7 +246,7 @@
 			
 <!--弹出（日收支）-->
 <div class="modal hide fade" id="inputincome">
-		<div class="modal-dialog ">
+		<div class="modal-dialog modal-lg">
 			<div class="modal-content">
 				<div class="modal-header">
 					<h3>录入日常收支</h3>
@@ -263,11 +263,241 @@
 								<select name="payMentsType" node-payMentsSelect>
 									<option value="INCOME">收入</option>
 									<option value="EXPENDITURE">支出</option>
+									<option value="FinancialBox">理财</option>
+									<option value="Bank">银行互转</option>
 								</select>
 							</td>
 						</tr>
 					</tbody>
 				</table>
+
+				<!-- 理财 -->
+				<div id="FinancialBox" style="display:none">
+				<form action="/paymentsIncomeDo" method="post" id="paymentsIncome" class="nice-validator n-default" novalidate="novalidate"></form>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+						<tr>
+							<th class="taC" colspan="2">理财信息填写</th>
+						</tr>
+						<tr>
+							<td width="50%">
+								<table class="table table-bordered table-condensed">
+									<tbody>
+										<tr>
+											<th class="taC" colspan="2">支出信息</th>
+										</tr>
+										<tr>
+											<th class="taC">支出</th>
+											<td>
+												<select>
+													<option>理财</option>
+													<option>银行</option>
+												</select>
+											</td>
+										</tr>
+										<tr>
+											<th class="taC">理财</th>
+											<td>
+												<select>
+													<option>广发理财</option>
+													<option>工行理财</option>
+												</select>
+
+												<div node-accountMsg7 >
+													可提取余额：￥{{statisticsList.financingPrice.0.financingPrice}}
+													<br/>
+													<label class="radio inline"><input name="accountMsg7" value="公司固定" checked type="radio">公司固定</label>
+													<label class="radio inline"><input name="accountMsg7" value="公司活期" type="radio">公司活期</label>
+													<label class="radio inline"><input name="accountMsg7" value="个人（GR）" type="radio">个人（GR）</label>
+												</div>
+											</td>
+										</tr>
+										<tr node-incomeBank>
+											<th class="taC">银行</th>
+											<td>
+												<select name="receivedBank">
+													<option value="纵横广发">纵横广发</option>
+													<option value="个人广发">个人广发</option>
+													<option value="华润银行">（广发）纵横知道</option>
+													<option value="纵横工行">纵横工行</option>
+												</select>
+											</td>
+										</tr>
+										<tr>
+											<th class="taC">支出金额</th>
+											<td><input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+										</tr>
+										<tr>
+											<th class="taC">支出信息</th>
+											<td><input type="text"></td>
+										</tr>
+										<tr>
+											<th class="taC">银行支出时间</th>
+											<td><input type="date"></td>
+										</tr>
+										<tr>
+											<th class="taC">备注</th>
+											<td><textarea class="form-control" name="remarks" rows="3"></textarea></td>
+										</tr>
+									</tbody>
+								</table>
+							</td>
+							<td width="50%">
+								<table class="table table-bordered table-condensed">
+									<tbody>
+										<tr>
+											<th class="taC" colspan="2">收入信息</th>
+										</tr>
+
+										<tr>
+											<th class="taC">收款</th>
+											<td>
+												<select>
+													<option>理财</option>
+													<option>银行</option>
+												</select>
+											</td>
+										</tr>
+										<tr>
+											<th class="taC">理财</th>
+											<td>
+												<select>
+													<option>广发理财</option>
+													<option>工行理财</option>
+												</select>
+
+												<div node-accountMsg7 >
+													可提取余额：￥{{statisticsList.financingPrice.0.financingPrice}}
+													<br/>
+													<label class="radio inline"><input name="accountMsg7" value="公司固定" checked type="radio">公司固定</label>
+													<label class="radio inline"><input name="accountMsg7" value="公司活期" type="radio">公司活期</label>
+													<label class="radio inline"><input name="accountMsg7" value="个人（GR）" type="radio">个人（GR）</label>
+												</div>
+											</td>
+										</tr>
+
+										<tr node-incomeBank>
+											<th class="taC">银行</th>
+											<td>
+												<select name="receivedBank">
+													<option value="纵横广发">纵横广发</option>
+													<option value="个人广发">个人广发</option>
+													<option value="华润银行">（广发）纵横知道</option>
+													<option value="纵横工行">纵横工行</option>
+												</select>
+											</td>
+										</tr>
+										<tr>
+											<th class="taC">收款金额</th>
+											<td><input name="receivedPrice" id="receivedPrice"  value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+										</tr>
+										<tr>
+											<th class="taC">收款信息</th><td><input name="receivedMsg" id="receivedMsg"  value="" type="text"></td>
+										</tr>
+										
+										<tr>
+											<th class="taC">银行到款时间</th><td><input name="receivedDate" id="receivedDate"  value="{{date}}" type="date"></td>
+										</tr>
+										
+										<tr>
+											<th class="taC">备注</th>
+											<td><textarea class="form-control" name="remarks" rows="3"></textarea></td>
+										</tr>
+									</tbody>
+								</table>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+				</div>
+
+				<!-- 银行互转 -->
+				<div id="Bank" style="display:none">
+				<table class="table table-bordered table-condensed">
+					<tbody>
+						<tr>
+							<th class="taC" colspan="2">银行转帐信息填写</th>
+						</tr>
+						<tr>
+							<td width="50%">
+								<table class="table table-bordered table-condensed">
+									<tbody>
+										<tr>
+											<th class="taC" colspan="2">支出信息</th>
+										</tr>
+										<tr>
+											<th class="taC">支出银行</th>
+											<td>
+												<select>
+													<option>请选择</option>
+													<option>广发存款</option>
+													<option>工行存款</option>
+												</select>
+												<p>可提取余额：￥0</p>
+											</td>
+										</tr>
+										<tr>
+											<th class="taC">支出金额</th>
+											<td><input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+										</tr>
+										<tr>
+											<th class="taC">支出信息</th>
+											<td><input type="text"></td>
+										</tr>
+										<tr>
+											<th class="taC">银行支出时间</th>
+											<td><input type="date"></td>
+										</tr>
+										<tr>
+											<th class="taC">备注</th>
+											<td><textarea class="form-control" name="remarks" rows="3"></textarea></td>
+										</tr>
+									</tbody>
+								</table>
+							</td>
+							<td width="50%">
+								<table class="table table-bordered table-condensed">
+									<tbody>
+										<tr>
+											<th class="taC" colspan="2">收入信息</th>
+										</tr>
+										<tr>
+											<th class="taC">收款银行</th>
+											<td>
+												<select>
+													<option value="纵横广发">纵横广发</option>
+													<option value="个人广发">个人广发</option>
+													<option value="华润银行">（广发）纵横知道</option>
+													<option value="纵横工行">纵横工行</option>
+												</select>
+											</td>
+										</tr>
+										<tr>
+											<th class="taC">收款金额</th>
+											<td><input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+										</tr>
+										<tr>
+											<th class="taC">收款信息</th>
+											<td><input type="text"></td>
+										</tr>
+										<tr>
+											<th class="taC">银行到款时间</th>
+											<td><input type="date"></td>
+										</tr>
+										<tr>
+											<th class="taC">备注</th>
+											<td><textarea class="form-control" name="remarks" rows="3"></textarea></td>
+										</tr>
+									</tbody>
+								</table>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+				</div>
+
+
+
 				<div id="INCOMEBox"  >
 				<form action="/paymentsIncomeDo" method="post" id="paymentsIncome" class="nice-validator n-default" novalidate="novalidate">
 				
@@ -291,7 +521,6 @@
 								
 								<option value='7'>广发理财</option>
 								<option value='9'>工行理财</option>
-
 								<option value='11'>广发存款</option>
 								<option value='12'>工行存款</option>
 
@@ -323,7 +552,6 @@
 							<label class="radio inline"><input name="accountMsg7" value="公司固定" checked type="radio">公司固定</label>
 							<label class="radio inline"><input name="accountMsg7" value="公司活期" type="radio">公司活期</label>
 							<label class="radio inline"><input name="accountMsg7" value="个人（GR）" type="radio">个人（GR）</label>
-							
 							</div>
 							<!--工行理财 二级-->
 							<div node-accountMsg9 style="display:none">
@@ -395,7 +623,6 @@
 								
 								<option value='4'>广发理财</option>
 								<option value='6'>工行理财</option>
-
 								<option value='8'>广发存款</option>
 								<option value='9'>工行存款</option>
 
@@ -451,14 +678,9 @@
 								</select>
 							</td>
 						</tr>
-						
-						
 						<tr>
 							<th class="taC">银行到款时间</th><td><input name="expenditureDate" id="expenditureDate"  value="{{date}}" type="date"></td>
 						</tr>
-						
-						
-						
 						<tr>
 							<th class="taC">备注</th>
 							<td><textarea class="form-control" name="remarks" rows="3"></textarea></td>

protected/view/humanResource/hr.html

@@ -77,7 +77,9 @@
 								<legend><div class="fR"></div>进行中</legend>
 								<table class="table table-bordered table-condensed">
 									<tbody>
-									<tr><th class="taC" width="140">员工名称</th><th class="taC">办事处/部门</th><th class="taC">岗位</th><th class="taC">状态</th><th class="taC" width="120">时间</th></tr>
+									<tr><th class="taC" width="140">员工名称</th><th class="taC">办事处/部门</th><th class="taC">岗位</th><th class="taC">状态</th>
+									<th class="taC" width="120">流程</th>
+									</tr>
 									<!-- loop staffProcessing -->
 									<tr>
 									<td><a href="#employeeInfo" node-employeeInfo node-sidKey="{{staffList' value.sidKey}}" data-toggle="modal">{{staffList' value.username}}</a></td>
@@ -96,7 +98,7 @@
 									待再入职
 									<!-- endif -->
 									</td>
-									<td width="120">2018-06-07</td>
+									<td>{{staffList' value.pendingMan}}</td>
 									</tr>
 									<!-- endloop -->