更新 日常收支权限

global/css/global.css

@@ -130,11 +130,11 @@ a.disenable{color:#ccc}
 }
 @font-face {
   font-family: 'ZHcldSystem';
-  src:  url('fonts/ZHcldSystem.eot?x90u1c');
-  src:  url('fonts/ZHcldSystem.eot?x90u1c#iefix') format('embedded-opentype'),
-    url('fonts/ZHcldSystem.ttf?x90u1c') format('truetype'),
-    url('fonts/ZHcldSystem.woff?x90u1c') format('woff'),
-    url('fonts/ZHcldSystem.svg?x90u1c#ZHcldSystem') format('svg');
+  src:  url('fonts/ZHcldSystem.eot?ox6e11');
+  src:  url('fonts/ZHcldSystem.eot?ox6e11#iefix') format('embedded-opentype'),
+    url('fonts/ZHcldSystem.ttf?ox6e11') format('truetype'),
+    url('fonts/ZHcldSystem.woff?ox6e11') format('woff'),
+    url('fonts/ZHcldSystem.svg?ox6e11#ZHcldSystem') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -294,7 +294,7 @@ table{max-width:100%;background-color:transparent;border-collapse:collapse;borde
 .table .table{background-color:#ffffff;}
 .table-condensed th,.table-condensed td{padding:4px 5px;}
 .table-condensed th .contactsTag,.table-condensed td .contactsTag{color:#fff}
-.table-bordered{border:1px solid #dddddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered td{border-left:1px solid #dddddd;}
+.table-bordered{border:1px solid #dddddd;border-collapse:collapse;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered td{border-left:1px solid #dddddd;}
 .table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;}
 .table-bordered thead:first-child tr:first-child>th:first-child,.table-bordered tbody:first-child tr:first-child>td:first-child,.table-bordered tbody:first-child tr:first-child>th:first-child{-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;}
 .table-bordered thead:first-child tr:first-child>th:last-child,.table-bordered tbody:first-child tr:first-child>td:last-child,.table-bordered tbody:first-child tr:first-child>th:last-child{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;}
@@ -1916,6 +1916,13 @@ a.new-ribbon:before{
 .borad-menu a.receipt:hover{
   background:#3A84C7
 }
+
+.borad-menu a.train{
+  background:#2daebf
+}
+.borad-menu a.train:hover{
+  background:#2ecade
+}
 .borad-menu a.invoice{
   background:#955251
 }
@@ -1943,7 +1950,7 @@ a.new-ribbon:before{
   min-height:400px
 }
 .saeaList .seTable{
-  margin:0 0 0 25.1%;
+  margin:0 0 0 30.1%;
 }
 .saeaList .seTable .sFile{
   margin: 0 5px 5px 0;
@@ -2064,9 +2071,9 @@ table .taC{
 }
 .saeaList .seCensor {
   position: absolute;
-  right:left;
+  left:0;
   top:0;
-  width:25%;
+  width:30%;
   height:100%;
   background:#f6f6f6
 }
@@ -2194,6 +2201,9 @@ table .taC{
 .public-censor .title  {
   background:#008659
 }
+.train-censor .title  {
+  background:#2daebf
+}
 .loan-censor .detail p:first-letter{
   font-size:24px;
   font-weight:bold;
@@ -2209,6 +2219,11 @@ table .taC{
   font-weight:bold;
   color:#008659
 }
+.train-censor .detail p:first-letter{
+  font-size:24px;
+  font-weight:bold;
+  color:#2daebf
+}
 .loan-list.entry  {
   border-top:2px solid #5C0793
 }
@@ -2218,6 +2233,9 @@ table .taC{
 .public-list.entry  {
   border-top:2px solid #008659
 }
+.train-list.entry  {
+  border-top:2px solid #2daebf
+}
 .loan-list table .taC{
   color:#5C0793
 }
@@ -2227,6 +2245,9 @@ table .taC{
 .public-list table .taC{
   color:#008659
 }
+.train-list table .taC{
+  color:#2daebf
+}
 .censorList {
   background-color: #fff;
   background:#fff url(timeline_hline2.png) repeat-y scroll 26px 0px;
@@ -2370,6 +2391,29 @@ table .taC{
   line-height:38px;
   margin:0;
 }
+.globalNotice-staff{
+  background-clip: padding-box;
+  background-color: #191818;
+  box-shadow: 0 2px 10px  rgba(0, 0, 0, 0.8);
+  right:20px;
+  outline: 0 none;
+  position: fixed;
+  bottom:20px;
+  width:400px;
+  z-index: 1050;
+  color:#fff;
+}
+.globalNotice-staff .item{
+  padding:10px 0 0 10px;
+}
+.globalNotice-staff .entry {
+  border-bottom:1px solid #222222;
+}
+.globalNotice-staff .entry .button{
+  height:38px;
+  line-height:38px;
+  margin:0;
+}
 .staffList{
  overflow-y: auto;
 }
@@ -2487,43 +2531,35 @@ table .taC{
 .appDown {
   background:url(appbg.jpg) no-repeat center center;
   position:relative;
+  color:#fff;
 }
-.appDown .phone{
-  background:url(appphone.png) no-repeat 0 0;
-  width:516px;
-  height:697px;
-  position:absolute;
-  left:10%;
-  top:50%;
-  margin-top:-350px;
+.appDown legend{
+  color:#fff;
 }
-.appDown .title{
-  background:url(appphone.png) no-repeat 0 -697px;
-  height:102px;
-  width:400px;
-  position:absolute;
-  left:55%;
-  top:20%;
-
+.appDown .android-panel,.appDown .iphone-panel{
+  width:35%;
+  float:left;
+  border:1px solid #fff;
+  padding:30px 40px;
+  margin:30px;
+  border-radius: 10px;
+  background:rgb(0,0,0,.6);
 }
-.appDown .down {
-  position:absolute;
-  left:55%;
-  top:40%;
+.appDown .qrcode{
+  background:url(qrcode.png) no-repeat;
   width:220px;
+  height:220px;
+  margin:0 0 15px 0;
+  position: relative;
 }
-.appDown .down h1{
-  font-size:36px;
-  color:#fff;
-}
-.appDown .down .qrcode{
-  background:url(qrcode.png) no-repeat;
+.appDown .qrcode2{
+  background:url(qrcode2.png) no-repeat;
   width:220px;
   height:220px;
   margin:0 0 15px 0;
   position: relative;
 }
-.down .qrcode .saoma{
+.qrcode .saoma{
   width:160px;
   height:240px;
   background:url(weixin.png) no-repeat;
@@ -2537,7 +2573,7 @@ table .taC{
   -ms-transition: all 1.5s ease-in-out;
   transition: all 1.5s ease-in-out;
 }
-.down .qrcode:hover .saoma{
+.qrcode:hover .saoma{
  left:240px;
   opacity: 1;
 }
@@ -3500,6 +3536,10 @@ legend .search{
   width: 179px;
   border-right: 1px solid #DDD
 }
+.sideMnav .navLeve0 .selected,.sideMnav .navLeve0 .selected span{
+  background:#f1f1f1;
+  color:#8E0950;
+}
 .sideSnav .snavLeve0 .num{
 color: #FFF;
 background: #999 none repeat scroll 0% 0%;
@@ -3848,29 +3888,6 @@ td div.dlLev3{
   border:1px solid #eee;
   z-index:99;
 }
-.globalNotice-staff{
-  background-clip: padding-box;
-  background-color: #191818;
-  box-shadow: 0 2px 10px  rgba(0, 0, 0, 0.8);
-  right:20px;
-  outline: 0 none;
-  position: fixed;
-  bottom:20px;
-  width:400px;
-  z-index: 1050;
-  color:#fff;
-}
-.globalNotice-staff .item{
-  padding:10px 0 0 10px;
-}
-.globalNotice-staff .entry {
-  border-bottom:1px solid #222222;
-}
-.globalNotice-staff .entry .button{
-  height:38px;
-  line-height:38px;
-  margin:0;
-}
 .alert-warning {
   color: #856404;
   background-color: #fff3cd;
@@ -3882,4 +3899,10 @@ td div.dlLev3{
 .versionTabale tr th,.versionTabale tr td{
   padding:8px 15px;
   border-bottom: 1px solid #f1f1f1;
+}
+.btn-binding{
+  margin:0 0 0 5px;
+  width:60px;
+  height:26px;
+  line-height: 26px;
 }

global/js/humanResource.js

@@ -183,6 +183,35 @@ $(function() {
 		});
 	});
 	
+	//获得再入职审批数据
+	$("a[node-approvalsReentry]").click(function(){
+		var sidkey=$(this).attr('node-sidKey');
+		var type='STAFF';
+		
+		var url = "/ajaxGetStaffInfoByType";
+		$.ajax({
+			url : url,
+			type : "post",
+			cache : false,
+			dataType : "json",
+			data : {
+				serial : sidkey,
+				type:type
+			},
+			global : true,
+			success : function(data) {
+				if (data.status == 1) {
+					$("#sidKeyReentry").val(data.sidKey);
+					$("#staffDetailReentry").html(data.html);
+				} else
+					$("div[loading-msg='true']").html("illegal request");
+			},
+			error : function(err) {
+				$("div[loading-msg='true']").html("");
+			}
+		});
+	});
+	
 	//获得员工更新数据
 	$("a[node-employeeInfo]").click(function(){
 		var sidkey=$(this).attr('node-sidKey');
@@ -380,6 +409,43 @@ $(function() {
 	//编辑员工CLD访问权限
 	$('a[employee-access]').click(function() {
 		var sidkey=$(this).attr('node-sidKey');
+		var selectData=$(this).attr('select-data');
+		console.log(selectData);
+		$("#Access_INFORMATION").attr("checked",false);
+		$("#Access_DIRECTORIES").attr("checked",false);
+		$("#Access_LOCK").attr("checked",false);
+		$("#Access_RECEIPTS").attr("checked",false);
+		$("#Access_INVOICE").attr("checked",false);
+		$("#Access_HR").attr("checked",false);
+		$("#Access_BUILD").attr("checked",false);
+		if(selectData!=''){
+		var jsonStr = JSON.parse(selectData);
+		for(var j = 0;j<jsonStr.length;j++){
+			console.log(jsonStr[j]);
+			if(jsonStr[j]=='INFORMATION'){
+				$("#Access_INFORMATION").attr("checked",true);
+			}
+			if(jsonStr[j]=='DIRECTORIES'){
+				$("#Access_DIRECTORIES").attr("checked",true);
+			}
+			if(jsonStr[j]=='LOCK'){
+				$("#Access_LOCK").attr("checked",true);
+			}
+			if(jsonStr[j]=='RECEIPTS'){
+				$("#Access_RECEIPTS").attr("checked",true);
+			}
+			if(jsonStr[j]=='INVOICE'){
+				$("#Access_INVOICE").attr("checked",true);
+			}
+			if(jsonStr[j]=='HR'){
+				$("#Access_HR").attr("checked",true);
+			}
+			if(jsonStr[j]=='BUILD'){
+				$("#Access_BUILD").attr("checked",true);
+			}
+		}
+		}
+		
 		$("#sidKeyAccess").val(sidkey);
 	});
 	

global/js/index.js

@@ -1699,7 +1699,10 @@ $(function() {
 				if(data.longle.alloted_time!="")
 					kk="期限："+data.longle.alloted_time;
 				
+				if(data.longle.version!="")
 				$("#longleStatus").html(data.longle.statusT+"/"+data.longle.product+"/("+data.longle.version+")"+kk);
+				else
+				$("#longleStatus").html(data.longle.statusT+"/"+data.longle.product+""+kk);
 				
 				$("#LongleLogHtml").html(data.longleLogHtml);
 				

protected/class/receipt.func.php

@@ -170,9 +170,9 @@ function _getPaymentsCollectPayByYearHtml($statisticsPay = array()) {
 				$falg = true;
 				foreach ( $statisticsPay as $key => $value ) {
 					if ($value ['expenditureMsg'] == '' && $value ['month'] == $month && $value ['expenditureType'] == $i) {
-						$html .= '<td class="taR">￥' . $value ['payPrice'] . '</td>';
-						$sum += $value ['payPrice'];
-						$subtotalSum [$month] += $value ['payPrice'];
+						$html .= '<td class="taR">￥' . abs($value ['payPrice']) . '</td>';
+						$sum += abs($value ['payPrice']);
+						$subtotalSum [$month] += abs($value ['payPrice']);
 						$falg = false;
 						break;
 					}
@@ -266,12 +266,12 @@ function _getPaymentsCollectByYearHtml($statisticsIncome = array()) {
 				$html .= '<td class="taR">￥' . $sum . '</td>';
 			$html .= '</tr>';
 			
-			$html .= '<th width="90">理财收益</th>';
+			$html .= '<th width="90">活期理财收益</th>';
 			$sum = 0;
 			for($month = 1; $month <= 12; $month ++) {
 				$falg = true;
 				foreach ( $statisticsIncome as $key => $value ) {
-					if ($value ['accountMsg'] == '理财收益' && $value ['month'] == $month && $value ['accountType'] == $i) {
+					if ($value ['accountMsg'] == '活期理财收益' && $value ['month'] == $month && $value ['accountType'] == $i) {
 						$html .= '<td class="taR">￥' . $value ['inComePrice'] . '</td>';
 						$sum += $value ['inComePrice'];
 						$subtotal [$month] += $value ['inComePrice'];
@@ -288,6 +288,29 @@ function _getPaymentsCollectByYearHtml($statisticsIncome = array()) {
 				$html .= '<td class="taR">￥' . $sum . '</td>';
 			$html .= '</tr>';
 			
+			$html .= '<th width="90">固定理财收益</th>';
+			$sum = 0;
+			for($month = 1; $month <= 12; $month ++) {
+				$falg = true;
+				foreach ( $statisticsIncome as $key => $value ) {
+					if ($value ['accountMsg'] == '固定理财收益' && $value ['month'] == $month && $value ['accountType'] == $i) {
+						$html .= '<td class="taR">￥' . $value ['inComePrice'] . '</td>';
+						$sum += $value ['inComePrice'];
+						$subtotal [$month] += $value ['inComePrice'];
+						$falg = false;
+						break;
+					}
+				}
+				if ($falg)
+					$html .= '<td class="taR">-</td>';
+			}
+			if ($sum == 0)
+				$html .= '<td class="taR">-</td>';
+				else
+					$html .= '<td class="taR">￥' . $sum . '</td>';
+					$html .= '</tr>';
+			
+			
 			$html .= '<th width="90">个人借款</th>';
 			$sum = 0;
 			for($month = 1; $month <= 12; $month ++) {
@@ -1115,9 +1138,9 @@ function _getPaymentsCollectPayByDayHtml($statisticsPay = array(), $day = 0) {
 				$falg = true;
 				foreach ( $statisticsPay as $key => $value ) {
 					if ($value ['expenditureMsg'] == '' && $value ['day'] == $month && $value ['expenditureType'] == $i) {
-						$html .= '<td class="taR">￥' . $value ['payPrice'] . '</td>';
-						$sum += $value ['payPrice'];
-						$subtotalSum [$month] += $value ['payPrice'];
+						$html .= '<td class="taR">￥' . abs($value ['payPrice']) . '</td>';
+						$sum += abs($value ['payPrice']);
+						$subtotalSum [$month] += abs($value ['payPrice']);
 						$falg = false;
 						break;
 					}
@@ -1145,7 +1168,7 @@ function _getPaymentsCollectPayByDayHtml($statisticsPay = array(), $day = 0) {
 	$html .= '<td class="taR colGreen">￥' . $sum . '</td>';
 	$html .= '</tr>';
 	$colspan = $day + 1;
-	$html .= '<tr class="warning"><td class="taR" colspan="2"><b>全年合计</b></td>
+	$html .= '<tr class="warning"><td class="taR" colspan="2"><b>全月合计</b></td>
 	  						<td class="colGreed taR" colspan="'.$colspan.'"><b style="font-size:24px">￥' . $sum . '</b></td></tr>';
 	
 	return array('html'=>$html,'sum'=>$sum);

protected/config/acl.conf.php

@@ -429,6 +429,7 @@ $acl ['RECEIPTS'] ['allow'] = array (
 				'ajaxGetWasteinvoiceReceivables',
 				'wasteBookIncome',
 				'wasteBookExpenditure',
+				'ajaxGetWasteInvoice',
 		)
 );
 //人资

protected/config/execute/execute.ini

@@ -1 +1 @@
-,41,41,41,41,58
+,41,41,41,41,58,42,42,42

protected/config/routes.conf.php

@@ -103,6 +103,9 @@ $route['*']['/addReceiptAuthorityManage'] = array('AdminController', 'addReceipt
 $route['get']['/delReceiptAuthorityManage/:sidKey/:icidKey'] = array('AdminController', 'delReceiptAuthorityManage');
 $route['*']['/delUserDistrictAuthor/:didKey/:sidKey'] = array('AdminController', 'delUserDistrictAuthor');
 
+$route['*']['/adminPaymentsAuthority'] = array('AdminController', 'adminPaymentsAuthority');
+
+
 $route['*']['/addRole'] = array('AdminController', 'addRole');
 $route['*']['/adminRole'] = array('AdminController', 'adminRole');
 $route['*']['/delRole/:rid'] = array('AdminController', 'delRole');
@@ -203,8 +206,10 @@ $route['post']['/paymentsExpenditureDo'] = array('ReceiptController', 'paymentsE
 $route['*']['/paymentsAchieve'] = array('ReceiptController', 'paymentsAchieve');
 $route['*']['/paymentsAchieve/:page/:expensesType'] = array('ReceiptController', 'paymentsAchieve');
 $route['*']['/ajaxGetPaymentsByAid'] = array('ReceiptController', 'ajaxGetPaymentsByAid');
-$route['post']['/paymentsIncomeUpdateDo'] = array('ReceiptController', 'paymentsIncomeUpdateDo');
-$route['post']['/paymentsExpenditureEdiDo'] = array('ReceiptController', 'paymentsExpenditureEdiDo');
+
+//$route['post']['/paymentsIncomeUpdateDo'] = array('ReceiptController', 'paymentsIncomeUpdateDo');
+//$route['post']['/paymentsExpenditureEdiDo'] = array('ReceiptController', 'paymentsExpenditureEdiDo');
+
 $route['post']['/paymentsDelDo'] = array('ReceiptController', 'paymentsDelDo');
 $route['*']['/paymentsCollect'] = array('ReceiptController', 'paymentsCollect');
 $route['*']['/paymentsCollectDay'] = array('ReceiptController', 'paymentsCollectDay');
@@ -213,6 +218,8 @@ $route['*']['/paymentsCollectDay'] = array('ReceiptController', 'paymentsCollect
 $route['*']['/wasteBook'] = array('ReceiptController', 'wasteBook');
 $route['*']['/ajaxGetWasteReceipt'] = array('ReceiptController', 'ajaxGetWasteReceipt');
 $route['*']['/ajaxGetWasteinvoiceReceivables'] = array('ReceiptController', 'ajaxGetWasteinvoiceReceivables');
+$route['*']['/ajaxGetWasteInvoice'] = array('ReceiptController', 'ajaxGetWasteInvoice');
+
 
 $route['*']['/wasteBookIncome'] = array('ReceiptController', 'wasteBookIncome');
 $route['*']['/wasteBookExpenditure'] = array('ReceiptController', 'wasteBookExpenditure');
@@ -551,6 +558,9 @@ $route['*']['/ajaxSetNotificationConf'] = array('SettingController', 'ajaxSetNot
 $route['post']['/staffUpdate'] = array('SettingController', 'staffUpdate');
 $route['post']['/settingCredentialInfoDo'] = array('SettingController', 'settingCredentialInfoDo');
 
+$route['*']['/settingAvatarInfo'] = array('SettingController', 'settingAvatarInfo');
+$route['*']['/settingAvatar'] = array('SettingController', '_settingAvatar');
+
 
 
 $route['post']['/settingCredentialInfoTypeDo/:hunTian'] = array('SettingController', 'settingCredentialInfoTypeDo');
@@ -575,6 +585,14 @@ $route['post']['/employeeCCAdd'] = array('HumanResourceController', 'employeeCCA
 $route['post']['/employeeInductionApprovals'] = array('HumanResourceController', 'employeeInductionApprovals');
 $route['post']['/employeeDimissionApprovals'] = array('HumanResourceController', 'employeeDimissionApprovals');
 
+$route['get']['/reentryApprovals'] = array('HumanResourceController', 'reentryApprovals');
+$route['post']['/reentryApprovalsAdd'] = array('HumanResourceController', 'reentryApprovalsAdd');
+$route['post']['/reentryCCAdd'] = array('HumanResourceController', 'reentryCCAdd');
+$route['post']['/employeeReentryApply'] = array('HumanResourceController', 'employeeReentryApply');
+$route['post']['/employeeReentryApprovals'] = array('HumanResourceController', 'employeeReentryApprovals');
+
+
+
 $route['get']['/leaveOfficeApprovals'] = array('HumanResourceController', 'leaveOfficeApprovals');
 $route['post']['/employeeleaveCCAdd'] = array('HumanResourceController', 'employeeleaveCCAdd');
 $route['post']['/employeeleaveApprovalsAdd'] = array('HumanResourceController', 'employeeleaveApprovalsAdd');

protected/controller/AdminController.php

@@ -771,6 +771,7 @@ class AdminController extends DooController {
 		}
 		return "/adminRole";
 	}
+	
 	function adminExecute() {
 		Doo::loadModel ( 'staff' );
 		$staff = new staff ();
@@ -813,6 +814,7 @@ class AdminController extends DooController {
 		
 		$this->render ( "/admin/adminCarriedout", $data );
 	}
+	
 	function addExecute() {
 		$mold = $this->get_args ( 'mold' ) ? $this->get_args ( 'mold' ) : "";
 		$staff = $this->get_args ( 'staff' ) ? $this->get_args ( 'staff' ) : "";
@@ -860,7 +862,10 @@ class AdminController extends DooController {
 				) );
 			}
 		}
-		return "/adminExecute";
+		if($mold=='日常收支')
+			return "/adminPaymentsAuthority";
+		else
+			return "/adminExecute";
 	}
 	function delExecute() {
 		$uid = isset ( $this->params ['uid'] ) && is_numeric ( $this->params ['uid'] ) ? $this->params ['uid'] : 0;
@@ -894,9 +899,55 @@ class AdminController extends DooController {
 					'where' => 'eid = ' . $executeInfo ['eid'] 
 			) );
 		}
-		
-		return "/adminExecute";
+		if($executeInfo['mold']=='日常收支')
+			return "/adminPaymentsAuthority";
+		else
+			return "/adminExecute";
+	}
+	
+	//日常收支权限
+	function adminPaymentsAuthority() {
+		Doo::loadModel ( 'staff' );
+		$staff = new staff ();
+		Doo::loadModel ( "execute" );
+		$execute = new execute ();
+	
+		$data ['staffList'] = $staff->find ( array (
+				'select' => 'username,sid,avatar',
+				'asArray' => true
+		) );
+		$list = $execute->find ( array (
+				'asArray' => true
+		) );
+	
+		$execute = array (
+				'日常收支' => ''
+		);
+		foreach ( $list as $key => $value ) {
+			$name = json_decode ( $value ['staff'] );
+			$staffString = "";
+			if (! empty ( $name )) {
+				foreach ( $name as $k => $v ) {
+						
+					$staffString .= " " . $v [1] . '<a href="javascript:if(window.confirm(\'确认删除?\'))window.location=\'/delExecute/' . $v [0] . '/' . $value ['eid'] . '\'"  title="删除" class="icon-">k</a>';
+				}
+			}
+			foreach ( $execute as $k => $v ) {
+				if ($k == $value ['mold']) {
+					$execute [$k] = $name = $staffString;
+				}
+			}
+		}
+		// print_r($execute);die;
+		$data ['execute'] = $execute;
+		$data ['memu'] = "verify";
+		$data ['staff'] = $this->staff;
+	
+		$this->render ( "/admin/adminPaymentsAuthority", $data );
 	}
+	
+	
+	
 	function adminInvoice() {
 		Doo::loadModel ( 'staff' );
 		$staff = new staff ();
@@ -1174,6 +1225,8 @@ class AdminController extends DooController {
 		die ( 'illegal request' );
 	}
 	
+	
+	
 	/**
 	 * 去除查看办事处汇总人员
 	 */

protected/controller/HumanResourceController.php

@@ -162,13 +162,14 @@ class HumanResourceController extends DooController {
 			$staff->pendStatus = 0;
 			$staff->pendingApprovals = 0;
 			$staff->InductionDate = date ( "Y-m-d H:i:s" );
+			$staff->cldAccess='["INFORMATION","DIRECTORIES","LOCK","RECEIPTS","INVOICE"]';
 			
 			if ($staffDetail ['nature'] == 2)
 				$staff->practiceDate = date ( "Y-m-d H:i:s" );
 			if ($staffDetail ['nature'] == 3)
 				$staff->probationaryDate = date ( "Y-m-d H:i:s" );
-			
-			//发送短信
+				
+				// 发送短信
 			$passwork = mt_rand ( 100000, 999999 );
 			$staff->passwork = md5 ( $passwork );
 			
@@ -193,36 +194,199 @@ class HumanResourceController extends DooController {
 					'operation' => "员工 入职审批通过",
 					'status' => 3,
 					'img' => $this->staff ['avatar'],
-					'username' => $this->staff['username'],
+					'username' => $this->staff ['username'],
 					'uid' => $staffDetail ['sid'],
 					'category' => $this->staff ['category'],
-					'sid'=>$this->staff ['sid'],
+					'sid' => $this->staff ['sid'] 
 			);
 			
 			$staffOperationLog->setInvoiceOperationLog ( $item );
 			
-			//发送微信抄送
-			$msg = '[抄送]'.$staffDetail['category'].'-'.$staffDetail['username'].'申请入职成功\n入职时间：'.$staffDetail['hiredate'];
+			// 发送微信抄送
+			$msg = '[抄送]' . $staffDetail ['category'] . '-' . $staffDetail ['username'] . '申请入职成功\n入职时间：' . $staffDetail ['hiredate'];
 			
-			$cidmode=$staffDetail['cid'];
-			if(!empty($staffDetail['departmentID']))
-				$cidmode=$staffDetail['cid'].'-'.$staffDetail['departmentID'];
-			$InductionCC=$staffManage->getStaffManageByCid($cidmode);
+			$cidmode = $staffDetail ['cid'];
+			if (! empty ( $staffDetail ['departmentID'] ))
+				$cidmode = $staffDetail ['cid'] . '-' . $staffDetail ['departmentID'];
+			$InductionCC = $staffManage->getStaffManageByCid ( $cidmode );
 			$InductionCC = json_decode ( $InductionCC ['CC'], true );
 			
-			foreach ($InductionCC as $value){
-				$this->setWXMsg ( $value[0],$msg );
+			foreach ( $InductionCC as $value ) {
+				$this->setWXMsg ( $value [0], $msg );
 			}
 		}
-
+		
 		$staff->updateDate = date ( "Y-m-d H:i:s" );
 		$staff->update ( array (
 				'where' => 'sid=' . $sid 
 		) );
 		
+		// 权限跳转
+		$staff = new staff ();
+		$CAAdetail = $staff->getStaffBySid ( $_COOKIE ["staff"] );
+		$accessModular = 'HR';
+		if (in_array ( $accessModular, $CAAdetail ['cldAccessArray'] )) {
+			return '/hr';
+		} else {
+			$list = $staff->getApprovalData ( $CAAdetail ['sid'] );
+			
+			$isVisit = count ( $list );
+			if ($isVisit > 0) { // 未做强制不能访问
+				return '/hr';
+			} else {
+				header ( 'Content-Type:text/html;charset=utf-8' );
+				echo "审批成功 <a href='/'>点击跳转首页</a>";
+				die ();
+			}
+		}
+	}
+	
+	/**
+	 * 员工再入职审批
+	 */
+	function employeeReentryApprovals() {
+		Doo::loadModel ( 'staff' );
+		$staff = new staff ();
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 5 );
+		Doo::loadModel ( 'reentryManage' );
+		$staffManage = new reentryManage ();
+		
+		$sidKey = $this->get_args ( 'sidKey' ) ? $this->get_args ( 'sidKey' ) : "";
+		
+		$sid = $XDeode->decode ( $sidKey );
+		if (! is_numeric ( $sid ) || empty ( $sid ))
+			die ( 'illegal request' );
+		
+		$staffDetail = $staff->getOne ( array (
+				'where' => 'pendStatus=7 and sid=' . $sid . ' and pendingApprovals=' . $this->staff ['sid'],
+				'asArray' => true 
+		) );
+		
+		if (empty ( $staffDetail ))
+			die ( 'illegal request' );
 		
+		$processApprovals = json_decode ( $staffDetail ['processApprovals'], true );
+		$invoiceManage = json_decode ( $staffDetail ['staffManage'], true );
 		
+		$staff = new staff ();
+		if (empty ( $processApprovals )) {
+			$processApprovals = array (
+					$this->staff ['sid'] => array (
+							'date' => date ( "Y-m-d H:i:s" ) 
+					) 
+			);
+			$nextInvoiceManage = next ( $invoiceManage );
+			
+			if ($nextInvoiceManage !== false)
+				$staff->pendingApprovals = $nextInvoiceManage [0];
+			$staff->processApprovals = json_encode ( $processApprovals );
+		} else {
+			$processApprovals [$this->staff ['sid']] = array (
+					'date' => date ( "Y-m-d H:i:s" ) 
+			);
+			
+			$pendingApprovals = 0;
+			foreach ( $invoiceManage as $key => $value ) {
+				if ($value [0] == $this->staff ['sid']) {
+					if (isset ( $invoiceManage [$key + 1] ))
+						$pendingApprovals = $invoiceManage [$key + 1] [0];
+					break;
+				}
+			}
+			
+			if (! empty ( $pendingApprovals ))
+				$staff->pendingApprovals = $pendingApprovals;
+			$staff->processApprovals = json_encode ( $processApprovals );
+		}
+		
+		if (count ( $processApprovals ) == count ( $invoiceManage )) {
+			// 确认再入职
+			// Doo::loadClass ( 'XDeode' );
+			// $XDeode = new XDeode ( 5 );
+			// Doo::loadModel ( 'staff' );
+			// $staff = new staff ();
+			
+			// $sid = $XDeode->decode ( $sidKey );
+			
+			// $detail = $staff->getStaffBySid ( $sid );
+			
+			$staffDetail;
+			$staff2 = new staff ();
+			
+			// 工龄记录
+			$seniorityFormula = json_decode ( $staffDetail ['seniorityFormula'] );
+			array_push ( $seniorityFormula, array (
+					'InductionDate' => date ( "Y-m-d H:i:s" ),
+					'dimissionDate' => '' 
+			) );
+			
+			$item = array (
+					'sid' => $sid,
+					'nature' => 1,
+					'pendStatus' => 0,
+					'seniorityFormula' => json_encode ( $seniorityFormula ),
+					'hiredate' => date ( "Y-m-d" ) ,
+					'cldAccess'=>'["INFORMATION","DIRECTORIES","LOCK","RECEIPTS","INVOICE"]',
+			);
+			$staff2->setStaffByCondition ( $item );
+			// 更新假期相关信息
+			Doo::loadModel ( 'holidaystaff' );
+			$holidaystaff = new HStaff ();
+			$holidaystaff->delete ( array (
+					'where' => 'uid=' . $sid 
+			) );
+			$holidaystaff = new HStaff ();
+			$holidaystaff->uid = $sid;
+			$holidaystaff->insert ();
+			$staff = new staff ();
+			$staffmsg = $staff->getUserById ( $sid );
+			$this->updateAnnualLeave ( $staffmsg [0] );
+			
+			// 发送短信
+			$passwork = mt_rand ( 100000, 999999 );
+			$staff->passwork = md5 ( $passwork );
+			
+			if (! empty ( $staffDetail ['telephone'] ) && is_numeric ( $staffDetail ['telephone'] )) {
+				Doo::loadClass ( 'Human.func' );
+				$msg = $staffDetail ['username'] . ',' . $passwork;
+				send_sms ( 17280, $staffDetail ['telephone'], '{"%msg%":"' . $msg . '"}' );
+			}
+			
+			// 操作日志
+			Doo::loadModel ( 'staffOperationLog' );
+			$staffOperationLog = new staffOperationLog ();
+			
+			$item = array (
+					'date' => date ( "Y-m-d H:i:s" ),
+					'operation' => "员工 再入职审批通过",
+					'status' => 3,
+					'img' => $this->staff ['avatar'],
+					'username' => $this->staff ['username'],
+					'uid' => $staffDetail ['sid'],
+					'category' => $this->staff ['category'],
+					'sid' => $this->staff ['sid'] 
+			);
+			$staffOperationLog->setInvoiceOperationLog ( $item );
+			
+			// 发送微信抄送
+			$msg = '[抄送]' . $staffDetail ['category'] . '-' . $staffDetail ['username'] . '申请 再入职成功\n入职时间：' . date ( "Y-m-d" );
+			
+			$cidmode = $staffDetail ['cid'];
+			if (! empty ( $staffDetail ['departmentID'] ))
+				$cidmode = $staffDetail ['cid'] . '-' . $staffDetail ['departmentID'];
+			$InductionCC = $staffManage->getStaffManageByCid ( $cidmode );
+			$InductionCC = json_decode ( $InductionCC ['CC'], true );
+			
+			foreach ( $InductionCC as $value ) {
+				$this->setWXMsg ( $value [0], $msg );
+			}
+		}
 		
+		$staff->updateDate = date ( "Y-m-d H:i:s" );
+		$staff->update ( array (
+				'where' => 'sid=' . $sid 
+		) );
 		
 		// 权限跳转
 		$staff = new staff ();
@@ -308,7 +472,6 @@ class HumanResourceController extends DooController {
 			// $staff->dimissionDate = date ( "Y-m-d" );
 			$staff->pendingApprovalsLeave = 0;
 			
-			
 			// 操作日志
 			Doo::loadModel ( 'staffOperationLog' );
 			$staffOperationLog = new staffOperationLog ();
@@ -317,13 +480,12 @@ class HumanResourceController extends DooController {
 					'operation' => "员工 离职审批通过",
 					'status' => 2,
 					'img' => $this->staff ['avatar'],
-					'username' => $this->staff['username'],
+					'username' => $this->staff ['username'],
 					'uid' => $staffDetail ['sid'],
 					'category' => $this->staff ['category'],
-					'sid'=>$this->staff ['sid'],
+					'sid' => $this->staff ['sid'] 
 			);
 			$staffOperationLog->setInvoiceOperationLog ( $item );
-			
 		}
 		
 		$staff->updateDate = date ( "Y-m-d H:i:s" );
@@ -331,8 +493,6 @@ class HumanResourceController extends DooController {
 				'where' => 'sid=' . $sid 
 		) );
 		
-		
-		
 		// 权限跳转
 		$staff = new staff ();
 		$CAAdetail = $staff->getStaffBySid ( $_COOKIE ["staff"] );
@@ -426,20 +586,16 @@ class HumanResourceController extends DooController {
 			$staffOperationLog = new staffOperationLog ();
 			$item = array (
 					'date' => date ( "Y-m-d H:i:s" ),
-					'operation' =>"员工 转正审批通过",
+					'operation' => "员工 转正审批通过",
 					'status' => 2,
 					
 					'img' => $this->staff ['avatar'],
-					'username' => $this->staff['username'],
+					'username' => $this->staff ['username'],
 					'uid' => $staffDetail ['sid'],
 					'category' => $this->staff ['category'],
-					'sid'=>$this->staff ['sid'],
-					
+					'sid' => $this->staff ['sid'] 
 			);
 			$staffOperationLog->setInvoiceOperationLog ( $item );
-			
-			
-			
 		}
 		
 		$staff->updateDate = date ( "Y-m-d H:i:s" );
@@ -447,8 +603,6 @@ class HumanResourceController extends DooController {
 				'where' => 'sid=' . $sid 
 		) );
 		
-		
-		
 		// 权限跳转
 		$staff = new staff ();
 		$CAAdetail = $staff->getStaffBySid ( $_COOKIE ["staff"] );
@@ -543,19 +697,18 @@ class HumanResourceController extends DooController {
 			$staff->achievementBonus = $appliedPromote [4];
 			$staff->positionId = $XDeode->decode ( $appliedPromote [0] );
 			
+			// 发送微信抄送
 			
-			//发送微信抄送
-			
-			$msg = '[抄送]'.$staffDetail['category'].'-'.$staffDetail['username'].'申请晋升成功\n晋升时间：'.date ( "Y-m-d" );
+			$msg = '[抄送]' . $staffDetail ['category'] . '-' . $staffDetail ['username'] . '申请晋升成功\n晋升时间：' . date ( "Y-m-d" );
 			
-			$cidmode=$staffDetail['cid'];
-			if(!empty($staffDetail['departmentID']))
-				$cidmode=$staffDetail['cid'].'-'.$staffDetail['departmentID'];
-			$InductionCC=$staffManage->getStaffManageByCid($cidmode);
+			$cidmode = $staffDetail ['cid'];
+			if (! empty ( $staffDetail ['departmentID'] ))
+				$cidmode = $staffDetail ['cid'] . '-' . $staffDetail ['departmentID'];
+			$InductionCC = $staffManage->getStaffManageByCid ( $cidmode );
 			$InductionCC = json_decode ( $InductionCC ['CC'], true );
 			
-			foreach ($InductionCC as $value){
-				$this->setWXMsg ( $value[0],$msg );
+			foreach ( $InductionCC as $value ) {
+				$this->setWXMsg ( $value [0], $msg );
 			}
 			
 			// 操作日志
@@ -569,14 +722,13 @@ class HumanResourceController extends DooController {
 					'status' => 3,
 					
 					'img' => $this->staff ['avatar'],
-					'username' => $this->staff['username'],
+					'username' => $this->staff ['username'],
 					'uid' => $staffDetail ['sid'],
 					'category' => $this->staff ['category'],
-					'sid'=>$this->staff ['sid'],
+					'sid' => $this->staff ['sid'] 
 			);
 			
 			$staffOperationLog->setInvoiceOperationLog ( $item );
-			
 		}
 		
 		$staff->updateDate = date ( "Y-m-d H:i:s" );
@@ -584,8 +736,6 @@ class HumanResourceController extends DooController {
 				'where' => 'sid=' . $sid 
 		) );
 		
-		
-		
 		// 权限跳转
 		$staff = new staff ();
 		$CAAdetail = $staff->getStaffBySid ( $_COOKIE ["staff"] );
@@ -851,11 +1001,11 @@ class HumanResourceController extends DooController {
 					'date' => date ( "Y-m-d H:i:s" ),
 					'status' => 1,
 					'img' => '/global/img/avtra',
-					'username' =>$this->staff['username'] ,
+					'username' => $this->staff ['username'],
 					'uid' => $id,
-					'sid'=>$this->staff['sid'],
+					'sid' => $this->staff ['sid'],
 					'operation' => "添加新员工",
-					'category' =>$this->staff['category'] 
+					'category' => $this->staff ['category'] 
 			);
 			$staffOperationLog->setInvoiceOperationLog ( $item );
 			
@@ -902,23 +1052,20 @@ class HumanResourceController extends DooController {
 						'regularsDate' => date ( "Y-m-d H:i:s" ) 
 				);
 				
-				
-				//发送微信抄送
+				// 发送微信抄送
 				Doo::loadModel ( 'staffRegularManage' );
 				$staffLeaveManage = new staffRegularManage ();
-				$msg = '[抄送]'.$staffDetail['category'].'-'.$staffDetail['username'].'申请转正成功\n转正时间：'.date ( "Y-m-d" );
-				
-				$cidmode=$staffDetail['cid'];
-				if(!empty($staffDetail['departmentID']))
-					$cidmode=$staffDetail['cid'].'-'.$staffDetail['departmentID'];
-					$InductionCC=$staffLeaveManage->getStaffManageByCid($cidmode);
-					$InductionCC = json_decode ( $InductionCC ['CC'], true );
-						
-					foreach ($InductionCC as $value){
-						$this->setWXMsg ( $value[0],$msg );
-					}
+				$msg = '[抄送]' . $staffDetail ['category'] . '-' . $staffDetail ['username'] . '申请转正成功\n转正时间：' . date ( "Y-m-d" );
 				
+				$cidmode = $staffDetail ['cid'];
+				if (! empty ( $staffDetail ['departmentID'] ))
+					$cidmode = $staffDetail ['cid'] . '-' . $staffDetail ['departmentID'];
+				$InductionCC = $staffLeaveManage->getStaffManageByCid ( $cidmode );
+				$InductionCC = json_decode ( $InductionCC ['CC'], true );
 				
+				foreach ( $InductionCC as $value ) {
+					$this->setWXMsg ( $value [0], $msg );
+				}
 			}
 			$staff->setStaffByCondition ( $item );
 			
@@ -929,10 +1076,10 @@ class HumanResourceController extends DooController {
 					'date' => date ( "Y-m-d H:i:s" ),
 					'status' => 1,
 					'img' => $this->staff ['avatar'],
-					'username' => $this->staff['username'],
+					'username' => $this->staff ['username'],
 					'uid' => $staffDetail ['sid'],
 					'category' => $this->staff ['category'],
-					'sid'=>$this->staff ['sid'],
+					'sid' => $this->staff ['sid'] 
 			);
 			if ($nature == 'TRIAL')
 				$item += array (
@@ -1033,11 +1180,10 @@ class HumanResourceController extends DooController {
 					'operation' => "申请入职",
 					
 					'img' => $staffDetail ['avatar'],
-					'username' => $staffDetail['username'],
+					'username' => $staffDetail ['username'],
 					'uid' => $staffDetail ['sid'],
 					'category' => $staffDetail ['category'],
-					'sid'=>$staffDetail ['sid'],
-					
+					'sid' => $staffDetail ['sid'] 
 			);
 			$staffOperationLog->setInvoiceOperationLog ( $item );
 			
@@ -1099,10 +1245,9 @@ class HumanResourceController extends DooController {
 				'username' => $this->staff ['username'],
 				'operation' => "申请离职",
 				'uid' => $this->staff ['sid'],
-				'category' => $this->staff ['category'] ,
-				
-				'sid'=>$this->staff ['sid'],
+				'category' => $this->staff ['category'],
 				
+				'sid' => $this->staff ['sid'] 
 		);
 		$staffOperationLog->setInvoiceOperationLog ( $item );
 		
@@ -1142,34 +1287,31 @@ class HumanResourceController extends DooController {
 				// 计算工龄天数
 				// echo $staff->seniorityFormula;
 			$day = $this->getSeniority ( $seniorityFormula );
-			$dimissionDate=date ( "Y-m-d " );
+			$dimissionDate = date ( "Y-m-d " );
 			$item = array (
 					'sid' => $sid,
 					'nature' => 4,
 					'pendStatus' => 4,
 					'seniorityFormula' => json_encode ( $seniorityFormula ),
 					'hireBiasDate' => $day,
-					'dimissionDate' =>  $dimissionDate
+					'dimissionDate' => $dimissionDate 
 			);
 			$staff->setStaffByCondition ( $item );
 			
-			
-			
-			//发送微信抄送
+			// 发送微信抄送
 			Doo::loadModel ( 'staffLeaveManage' );
 			$staffLeaveManage = new staffLeaveManage ();
-			$msg = '[抄送]'.$detail['category'].'-'.$detail['username'].'申请离职成功\n离职时间：'.$dimissionDate;
+			$msg = '[抄送]' . $detail ['category'] . '-' . $detail ['username'] . '申请离职成功\n离职时间：' . $dimissionDate;
 			
-			$cidmode=$detail['cid'];
-			if(!empty($detail['departmentID']))
-				$cidmode=$detail['cid'].'-'.$detail['departmentID'];
-			$InductionCC=$staffLeaveManage->getStaffManageByCid($cidmode);
+			$cidmode = $detail ['cid'];
+			if (! empty ( $detail ['departmentID'] ))
+				$cidmode = $detail ['cid'] . '-' . $detail ['departmentID'];
+			$InductionCC = $staffLeaveManage->getStaffManageByCid ( $cidmode );
 			$InductionCC = json_decode ( $InductionCC ['CC'], true );
-					
-			foreach ($InductionCC as $value){
-				$this->setWXMsg ( $value[0],$msg );
-			}
 			
+			foreach ( $InductionCC as $value ) {
+				$this->setWXMsg ( $value [0], $msg );
+			}
 			
 			return '/hrEmployee';
 		}
@@ -1226,10 +1368,9 @@ class HumanResourceController extends DooController {
 				'username' => $this->staff ['username'],
 				'operation' => "申请转正",
 				'uid' => $this->staff ['sid'],
-				'category' => $this->staff ['category'] ,
-				
+				'category' => $this->staff ['category'],
 				
-				'sid'=>$this->staff ['sid'],
+				'sid' => $this->staff ['sid'] 
 		);
 		$staffOperationLog->setInvoiceOperationLog ( $item );
 		
@@ -1304,14 +1445,11 @@ class HumanResourceController extends DooController {
 				
 				'operation' => "申请晋升" . $pDetail [1],
 				
-				
 				'img' => $this->staff ['avatar'],
-				'username' => $this->staff['username'],
+				'username' => $this->staff ['username'],
 				'uid' => $detail ['sid'],
 				'category' => $this->staff ['category'],
-				'sid'=>$this->staff ['sid'],
-				
-				
+				'sid' => $this->staff ['sid'] 
 		);
 		$staffOperationLog->setInvoiceOperationLog ( $item );
 		
@@ -1319,6 +1457,76 @@ class HumanResourceController extends DooController {
 	}
 	
 	/**
+	 * 再入职申请
+	 */
+	function employeeReentryApply() {
+		$sidKey = $this->get_args ( 'sidKey' ) ? $this->get_args ( 'sidKey' ) : "";
+		
+		if (! empty ( $sidKey )) {
+			Doo::loadClass ( 'XDeode' );
+			$XDeode = new XDeode ( 5 );
+			Doo::loadModel ( 'staff' );
+			$staff = new staff ();
+			Doo::loadModel ( 'reentryManage' );
+			$reentryManage = new reentryManage ();
+			
+			$sid = $XDeode->decode ( $sidKey );
+			
+			$detail = $staff->getStaffBySid ( $sid );
+			if (empty ( $detail ))
+				die ( 'illegal request' );
+			
+			$item = array (
+					'sid' => $sid,
+					'pendStatus' => 7 
+			);
+			$staff->setStaffByCondition ( $item );
+			
+			// 离职审批组
+			// 获得审批组KEY
+			$staff = new staff ();
+			$cidMode = $this->staff ['cid'];
+			if (! empty ( $this->staff ['departmentID'] ))
+				$cidMode = $detail ['cid'] . '_' . $detail ['departmentID'];
+			
+			$staffManageDetail = $reentryManage->getStaffManageByCid ( $cidMode );
+			if (empty ( $staffManageDetail ))
+				die ( 'illegal request ' );
+			
+			$pendingApprovalsSid = current ( $staffManageDetail ['staffList'] ) [0];
+			if (empty ( $pendingApprovalsSid ))
+				die ( 'illegal request ' );
+			$staff->pendingApprovals = $pendingApprovalsSid;
+			$staff->staffManage = $staffManageDetail ['staff'];
+			$staff->processApprovals = '';
+			$staff->sid = $detail ['sid'];
+			
+			// 抄送组
+			$staff->processCC = $staffManageDetail ['CC'];
+			$staff->update ();
+			
+			// 操作日志
+			Doo::loadModel ( 'staffOperationLog' );
+			$staffOperationLog = new staffOperationLog ();
+			$item = array (
+					'date' => date ( "Y-m-d H:i:s" ),
+					'status' => 3,
+					'img' => $detail ['avatar'],
+					'username' => $detail ['username'],
+					'operation' => "申请再入职",
+					'uid' => $detail ['sid'],
+					'category' => $detail ['category'],
+					
+					'sid' => $detail ['sid'] 
+			);
+			$staffOperationLog->setInvoiceOperationLog ( $item );
+			
+			return '/hrEmployee';
+		}
+		die ( 'illegal request' );
+	}
+	
+	/**
 	 * 确认在入职
 	 */
 	function employeeReentry() {
@@ -1370,6 +1578,184 @@ class HumanResourceController extends DooController {
 	}
 	
 	/**
+	 * 员工再入职审批流程
+	 */
+	function reentryApprovals() {
+		Doo::loadModel ( 'staff' );
+		$staff = new staff ();
+		Doo::loadModel ( 'L_category' );
+		$L_category = new L_category ();
+		Doo::loadModel ( 'reentryManage' );
+		$staffManage = new reentryManage ();
+		
+		// 获得办事和部门
+		$categoryList = $L_category->getCategoryDepartment ();
+		
+		$staffManageList = $staffManage->find ( array (
+				'asArray' => true 
+		) );
+		
+		foreach ( $staffManageList as $key => $value ) {
+			// 审批人员
+			$name = json_decode ( $value ['staff'] );
+			$employeeApprovals = array ();
+			if (count ( $name ) != 0) {
+				foreach ( $name as $ve ) {
+					array_push ( $employeeApprovals, $ve [1] );
+				}
+			}
+			$employeeApprovals = implode ( '->', $employeeApprovals );
+			
+			// 抄送人员
+			$name = json_decode ( $value ['CC'] );
+			$CC = array ();
+			if (count ( $name ) != 0) {
+				foreach ( $name as $ve ) {
+					array_push ( $CC, $ve [1] );
+				}
+			}
+			$CC = implode ( ' ', $CC );
+			
+			foreach ( $categoryList as $k => $v ) {
+				$cid = $v ['cid'];
+				if (isset ( $v ['did'] ))
+					$cid .= '_' . $v ['did'];
+				if ($cid == $value ['cid']) { // echo $cid.'//';echo $value['cid'].'<br/>';
+					$categoryList [$k] ['employeeApprovals'] = $employeeApprovals;
+					$categoryList [$k] ['CC'] = $CC;
+					break;
+				}
+			}
+		}
+		foreach ( $categoryList as $key => $value ) {
+			if (! isset ( $value ['employeeApprovals'] ))
+				$categoryList [$key] ['employeeApprovals'] = '';
+			if (! isset ( $value ['CC'] ))
+				$categoryList [$key] ['CC'] = '';
+		}
+		
+		// print_r($categoryList);
+		$stafflist = $staff->getStaff ( true );
+		
+		$this->data ['categoryList'] = $categoryList;
+		$this->data ['staffList'] = $stafflist;
+		
+		$this->data ['memu'] = "HumanResource";
+		$this->data ['hrMemu'] = "employeeApprovals";
+		
+		$this->render ( "/humanResource/reentryApprovals", $this->data );
+	}
+	
+	/**
+	 * 添加员工审批人员
+	 */
+	function reentryApprovalsAdd() {
+		$cidKey = $this->get_args ( 'cidKey' ) ? $this->get_args ( 'cidKey' ) : "";
+		$uidlist = $this->get_args ( 'uidlist' ) ? $this->get_args ( 'uidlist' ) : "";
+		$uidlist = explode ( ",", $uidlist );
+		
+		if (! empty ( $cidKey ) && ! empty ( $uidlist )) {
+			Doo::loadModel ( "reentryManage" );
+			$staffManage = new reentryManage ();
+			Doo::loadClass ( 'XDeode' );
+			$XDeode = new XDeode ( 5 );
+			
+			// 获得抄送内容
+			$approvalKey = explode ( '_', $cidKey );
+			$cidMode = array ();
+			foreach ( $approvalKey as $value ) {
+				$cid = $XDeode->decode ( $value );
+				array_push ( $cidMode, $cid );
+			}
+			
+			$cidMode = implode ( '_', $cidMode );
+			// echo $cidMode;die;
+			$staffManageInfo = $staffManage->getOne ( array (
+					'where' => 'cid ="' . $cidMode . '" ',
+					'asArray' => true 
+			) );
+			
+			// 审批人员
+			$list = array ();
+			foreach ( $uidlist as $key => $value ) {
+				$info = explode ( ":", $value );
+				array_push ( $list, $info );
+			}
+			
+			if (empty ( $staffManageInfo )) {
+				$staffManage = new reentryManage ();
+				
+				$staffManage->cid = $cidMode;
+				$staffManage->staff = json_encode ( $list );
+				
+				$staffManage->insert ();
+			} else {
+				$staffManage = new reentryManage ();
+				
+				$staffManage->staff = json_encode ( $list );
+				$staffManage->update ( array (
+						'where' => 'icid = ' . $staffManageInfo ['icid'] 
+				) );
+			}
+			return '/reentryApprovals';
+		}
+		die ( 'illegal request' );
+	}
+	
+	/**
+	 * 添加抄送员工，微信通知
+	 */
+	function reentryCCAdd() {
+		$cidKey = $this->get_args ( 'cidKey' ) ? $this->get_args ( 'cidKey' ) : "";
+		$staff = $this->get_args ( 'staff' ) ? $this->get_args ( 'staff' ) : "";
+		// && ! empty ( $staff )
+		if (! empty ( $cidKey )) {
+			Doo::loadModel ( "reentryManage" );
+			$staffManage = new reentryManage ();
+			Doo::loadClass ( 'XDeode' );
+			$XDeode = new XDeode ( 5 );
+			
+			// 获得抄送内容
+			$approvalKey = explode ( '_', $cidKey );
+			$cidMode = array ();
+			foreach ( $approvalKey as $value ) {
+				$cid = $XDeode->decode ( $value );
+				array_push ( $cidMode, $cid );
+			}
+			
+			$cidMode = implode ( '_', $cidMode );
+			$staffManageInfo = $staffManage->getOne ( array (
+					'where' => 'cid ="' . $cidMode . '" ',
+					'asArray' => true 
+			) );
+			
+			$list = array ();
+			foreach ( $staff as $key => $value ) {
+				$info = explode ( ":", $value );
+				array_push ( $list, $info );
+			}
+			
+			if (empty ( $staffManageInfo )) {
+				$staffManage = new reentryManage ();
+				
+				$staffManage->cid = $cidMode;
+				$staffManage->CC = json_encode ( $list );
+				
+				$staffManage->insert ();
+			} else {
+				$staffManage = new reentryManage ();
+				
+				$staffManage->CC = json_encode ( $list );
+				$staffManage->update ( array (
+						'where' => 'icid = ' . $staffManageInfo ['icid'] 
+				) );
+			}
+			return '/reentryApprovals';
+		}
+		die ( 'illegal request' );
+	}
+	
+	/**
 	 * 员工审批流程
 	 */
 	function employeeApprovals() {
@@ -2133,7 +2519,7 @@ class HumanResourceController extends DooController {
 		
 		$stafflist = $staff->getStaffByCondition ( $con );
 		
-		// print_r($stafflist);
+		//print_r($stafflist);
 		
 		$monthstart = date ( 'Y-m-d 00:00:00', mktime ( 0, 0, 0, date ( 'm' ), 1, date ( 'Y' ) ) );
 		$monthend = date ( 'Y-m-d 23:59:59', mktime ( 0, 0, 0, date ( 'm' ) + 1, 0, date ( 'Y' ) ) );
@@ -3220,7 +3606,7 @@ target="_blank">反面（照片）</a>
 	 * @param unknown $rid
 	 * @param string $typeMsg
 	 */
-	function setWXMsg($sid, $msg = '',$msgtype='text') {
+	function setWXMsg($sid, $msg = '', $msgtype = 'text') {
 		Doo::loadModel ( 'staff' );
 		$staff = new staff ();
 		$staffmsg = $staff->getOne ( array (

protected/controller/MainController.php

@@ -566,7 +566,7 @@ class MainController extends DooController {
 					array_unshift ( $bakCategory, array (
 							'cid' => $v ['cid'],
 							'title' => $value ['title'],
-							'count' => $value ['count'],
+							'count' => @$value ['count'],
 							'did' => $v ['did'],
 							'departmentName' => $v ['departmentName'] 
 					) );
@@ -6360,10 +6360,10 @@ class MainController extends DooController {
 					<table style="background-color:#fff;border:1px solid #ddd;border-bottom:0px;border-top:0px;width:100%;" cellpadding="0" cellspacing="0" align="left">
 					<tbody><tr><td style="padding: 0 40px;" align="left">
 
-					<p style="margin-top:40px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;"><b>CLIENTNAME</b>，您好</p>
+					<p style="margin-top:40px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;"><b>CLIENTNAME</b></p>
 					</td></tr><tr><td style="padding: 0 40px;" align="left">
 
-					<p style="margin-top:0px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;">我是纵横公路造价软件 <b>' . $this->staff [0] ['username'] . '</b>：</p>
+					<p style="margin-top:0px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;">您好,我是纵横公路造价软件 <b>' . $this->staff [0] ['username'] . '</b>：</p>
 					<p style="margin-top:0px;margin-bottom:20px;color:#383838;font-size:16px;line-height:32px;">
 					' . $content . '</p>
 
@@ -6371,17 +6371,34 @@ class MainController extends DooController {
 					<tr><td align="left" style="padding: 0 40px;background:#fff">
 						' . $annexHtml . '
 					</td></tr>
-					<tr> <td style="padding: 20px 40px;border-top:1px dashed #ddd" align="left">
-					<p style="margin-bottom:10px;color:#383838;font-size:16px;line-height:22px;border-left:2px solid #FF6501;padding-left:5px">
-					纵横公路造价软件' . $this->staff [0] ['category'] . '办事处</p>
-					 <table>
-					<tr><th align="right">电话：</th><td>' . $this->staff [0] ['phone'] . '</td></tr>
-					<tr><th align="right">联系人：</th><td>' . $this->staff [0] ['username'] . '</td></tr>
-					<tr><th align="right">手机：</th><td>' . $this->staff [0] ['telephone'] . '</td></tr>
-					<tr><th align="right">QQ：</th><td>' . $this->staff [0] ['qq'] . '</td></tr>
-					<tr><th align="right">邮箱：</th><td>' . $this->staff [0] ['email'] . '</td></tr>
-
-					</table></td></tr></tbody></table></td></tr><tr>
+					<tr> 
+								<td style="padding: 10px 0 0;background:#F6F6F6;">
+								
+								
+<table>
+                <tr>
+                  <td style="font-size:14pxl;color:#666;padding:0 20px"><b>纵横软件公司' . $this->staff [0] ['category'] . '服务中心</b><br>' . $this->staff [0] ['username'] . '<br>
+                  		<a href="[图片]http://www.smartcost.com.cn" style="color:#666;font-size:12px;text-decoration:underline;">[图片]smartcost.com.cn</a></td>
+                  <td>
+                    <table>
+                    <tr style="font-size:12px;color:#666">
+                      <th align="right">电话：</th><td style="padding:0 20px 0 0">' . $this->staff [0] ['phone'] . '</td>
+                      <th align="right">手机：</th><td>' . $this->staff [0] ['telephone'] . '</td>
+                    </tr>
+                    <tr style="font-size:12px;color:#666">
+                      <th align="right">Q Q：</th><td>' . $this->staff [0] ['qq'] . '</td>
+                      <th align="right">邮箱： </th><td>' . $this->staff [0] ['email'] . '</td>
+                      </tr>
+                  </table>
+                  </td>
+                </tr>
+              </table>
+								
+								
+								
+								
+					
+					 </td></tr></tbody></table></td></tr><tr>
 					<td style="padding: 0 40px;background-color:#383838;"><p style="color:#fff;padding:10px 0;text-align:center;margin:0">珠海纵横创新软件有限公司 <a href="http://www.smartcost.com.cn" style="color:#fff;text-decoration: underline;">smartcost.com.cn</a></p></td>
 					</tr></tbody></table></td></tr></tbody></table></div>';
 				$info = '<table><tr><th align="right">电话：</th><td>' . $this->staff [0] ['phone'] . '</td></tr>
@@ -6402,8 +6419,8 @@ class MainController extends DooController {
 					</tr><tr><td align="center" style="background-color:#fff;"><img width="640" height="191" src="http://zonghengvideo.qiniudn.com/hero.jpg"></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>
-					<p style="margin-top:0px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;">我是纵横公路造价软件 <b>' . $this->staff [0] ['username'] . '</b>：</p>
+					<p style="margin-top:0px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;"><b>CLIENTNAME</b></p>
+					<p style="margin-top:0px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;">您好,我是纵横公路造价软件 <b>' . $this->staff [0] ['username'] . '</b>：</p>
 
 					<p name="contentHtml" style="margin-top:0px;margin-bottom:15px;color:#383838;font-size:16px;line-height:32px;">' . $content . '</p></td>
 
@@ -6411,15 +6428,25 @@ class MainController extends DooController {
 					<tr><td align="left" style="padding: 0 40px;background:#fff">
 						' . $annexHtml . '
 					</td></tr>
-					<tr><td style="padding: 10px 0;background:#EEF2F5"><table><tbody><tr>
+					<tr>
+					<td style="padding: 10px 0;background:#F6F6F6">
+								
+								<table>
+								<tbody>
+								<tr>
 
-					<td style="font-size:14pxl;color:#333;padding:0 20px"><b>纵横公路造价软件' . $this->staff [0] ['category'] . '办事处</b><br>' . $this->staff [0] ['username'] . '</td>
+					<td style="font-size:14pxl;color:#333;padding:0 20px">
+								
+								<b>纵横公路造价软件' . $this->staff [0] ['category'] . '服务中心</b><br>' . $this->staff [0] ['username'] . '</td>
 
-					<td><table><tbody><tr style="font-size:12px;color:#666">
+					<td>
+										<table>
+										<tbody>
+										<tr style="font-size:12px;color:#666">
 
 					<th align="right">电话：</th><td style="padding:0 20px 0 0">' . $this->staff [0] ['phone'] . '</td>
 					<th align="right">手机：</th><td>' . $this->staff [0] ['telephone'] . '</td></tr><tr style="font-size:12px;color:#666">
-					<th align="right">QQ：</th><td>' . $this->staff [0] ['qq'] . '</td>
+					<th align="right">Q Q：</th><td>' . $this->staff [0] ['qq'] . '</td>
 					<th align="right">邮箱：	</th><td>' . $this->staff [0] ['email'] . '</td>
 
 					</tr></tbody></table></td></tr></tbody></table></td></tr></tbody></table></td></tr><tr>
@@ -6457,8 +6484,8 @@ class MainController extends DooController {
 				            </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:#666;font-size:16px;line-height:32px;"><b>CLIENTNAME</b>，您好</p>
-				             <p style="margin-top:0px;margin-bottom:10px;color:#666;font-size:16px;line-height:32px;">我是纵横公路造价软件 <b>' . $this->staff [0] ['username'] . '</b>：</p>
+				             <p style="margin-top:0px;margin-bottom:10px;color:#666;font-size:16px;line-height:32px;"><b>CLIENTNAME</b></p>
+				             <p style="margin-top:0px;margin-bottom:10px;color:#666;font-size:16px;line-height:32px;">您好,我是纵横公路造价软件 <b>' . $this->staff [0] ['username'] . '</b>：</p>
 				             <p name="contentHtml" style="margin-top:0px;margin-bottom:15px;color:#666;font-size:16px;line-height:32px;">' . $content . '</p></td>
 				            </tr>
 				            <tr><td align="left" style="padding: 0 40px;background:#fff">
@@ -6468,7 +6495,7 @@ class MainController extends DooController {
 				             <td style="padding: 10px 0 0;background:#F6F6F6;">
 				              <table>
 				                <tbody><tr>
-				                  <td style="font-size:14pxl;color:#666;padding:0 20px"><b>纵横公路造价软件' . $this->staff [0] ['category'] . '办事处</b><br>' . $this->staff [0] ['username'] . '<br><a href="http://www.smartcost.com.cn" style="color:#666;font-size:12px;text-decoration:underline;">smartcost.com.cn</a></td>
+				                  <td style="font-size:14pxl;color:#666;padding:0 20px"><b>纵横公路造价软件' . $this->staff [0] ['category'] . '服务中心</b><br>' . $this->staff [0] ['username'] . '<br><a href="http://www.smartcost.com.cn" style="color:#666;font-size:12px;text-decoration:underline;">smartcost.com.cn</a></td>
 				                  <td>
 				                    <table style="width:100%">
 				             				<tbody><tr style="font-size:12px;color:#496781">
@@ -6476,7 +6503,7 @@ class MainController extends DooController {
 				             					<th align="right">手机：</th><td>' . $this->staff [0] ['telephone'] . '</td>
 				             				</tr>
 				             				<tr style="font-size:12px;color:#496781">
-				             					<th align="right">QQ：</th><td>' . $this->staff [0] ['qq'] . '</td>
+				             					<th align="right">Q Q：</th><td>' . $this->staff [0] ['qq'] . '</td>
 				             					<th align="right">邮箱：	</th><td>' . $this->staff [0] ['email'] . '</td>
 				             					</tr>
 				             			</tbody></table>

protected/controller/SettingController.php

@@ -70,6 +70,16 @@ class SettingController extends DooController {
 		
 		$this->render ( "/setting/settingEmployeeInfo", $this->data );
 	}
+	
+	
+	function settingAvatarInfo(){
+		$this->data ['staff'] = $this->staff;
+		$this->data ['memu'] = "adminmyinfo";
+		$this->data ['hrMemu'] = "settingAvatarInfo";
+		
+		$this->render ( "/setting/settingAvatarInfo", $this->data );
+	}
+	
 	/**
 	 * 证件信息
 	 */
@@ -587,6 +597,62 @@ class SettingController extends DooController {
 	}
 	
 	/**
+	 * 上传头像专用
+	 */
+	function _settingAvatar() {
+		
+		$result = array ();
+		$result ['success'] = false;
+		$successNum = 0;
+		// 定义一个变量用以储存当前头像的序号
+		$avatarNumber = 1;
+		$i = 0;
+		$msg = '';
+		// 上传目录
+		$dir = DOO::conf ()->SITE_PATH . "global/avatar";
+		
+		// 遍历所有文件域
+		while ( list ( $key, $val ) = each ( $_FILES ) ) {
+			if ($_FILES [$key] ['error'] > 0)
+				$msg .= $_FILES [$key] ['error'];
+				else {
+					$fileName = 'avatar_' . $this->staff ['sid'];
+					// 原始图片(file 域的名称：__source，如果客户端定义可以上传的话，可在此处理）。
+					if ($key == '__source') { // 当前头像基于原图的初始化参数，用于修改头像时保证界面的视图跟保存头像时一致。帮助提升用户体验度。修改头像时设置默认加载的原图的url为此图片的url+该参数即可。
+						$initParams = $_POST ["__initParams"];
+						$virtualPath = $dir . "/" . $fileName . "_" . $avatarNumber . ".jpg";
+						$result ['sourceUrl'] = '/' . $virtualPath . $initParams;
+						move_uploaded_file ( $_FILES [$key] ["tmp_name"], $virtualPath );
+						$successNum ++;
+					} else if (strpos ( $key, '__avatar' ) === 0) { // 头像图片(file 域的名称：__avatar1,2,3...)。
+						$virtualPath = $dir . "/" . $fileName . "_" . $avatarNumber . ".jpg";
+						$result ['avatarUrls'] [$i] = '/' . $virtualPath;
+						move_uploaded_file ( $_FILES [$key] ["tmp_name"], $virtualPath );
+						$avatarNumber ++;
+						$successNum ++;
+						$i ++;
+					}
+				}
+		}
+		$result ['msg'] = $msg;
+		if ($successNum > 0)
+			$result ['success'] = true;
+			// 返回图片的保存结果（返回内容为json字符串）
+	
+			Doo::loadModel ( 'staff' );
+			$staff = new staff ();
+	
+			$staff->sid = $this->staff ['sid'];
+			$staff->avatar = "/global/avatar/" . $fileName;
+			$staff->update ();
+	
+			header('Cache-Control:no-cache,must-revalidate');
+			header('Pragma:no-cache');
+			
+			echo json_encode ( $result );
+	}
+	
+	/**
 	 * 获取get或者POST值
 	 *
 	 * @param string $name 属性名称

protected/model/staff.php

@@ -228,6 +228,8 @@ class staff extends DooModel {
 		$XDeode = new XDeode ( 5 );
 		Doo::loadModel ( 'department' );
 		$department = new department ();
+		Doo::loadModel ( 'position' );
+		$position = new position ();
 		
 		$condition = array (
 				'desc' => 'jobNumber',
@@ -252,6 +254,12 @@ class staff extends DooModel {
 			$list [$key] ['didKey'] = '';
 			if (!empty($value ['departmentID']))
 				$list [$key] ['didKey'] = $XDeode->encode ( $value ['departmentID'] );
+			
+				$list [$key] ['position'] ='';
+				$pdetail=$position->getPositionByPid($value['positionId']);
+				if (!empty($pdetail))
+					$list [$key] ['position'] =$pdetail['positionName'];
+				
 		}
 		
 		return $list;
@@ -351,17 +359,46 @@ class staff extends DooModel {
 	public function getStaffByCid($cid = 0) {
 		$list = $this->find ( array (
 				'asc' => 'sid',
-
 				'where' => "cid= '" . $cid . "' and nature !=4 ",
-
 				'asArray' => TRUE
 		) );
 		Doo::loadClass ( 'XDeode' );
 		$XDeode = new XDeode ( 5 );
+		Doo::loadModel ( 'position' );
+		$position = new position ();
+		
 		foreach ( $list as $key => $value ) {
 			$list [$key] ['sidKey'] = $XDeode->encode ( $value ['sid'] );
+			
+			$list [$key] ['position'] ='';
+			$pdetail=$position->getPositionByPid($value['positionId']);
+			if (!empty($pdetail))
+				$list [$key] ['position'] =$pdetail['positionName'];
+			
+		}
+		return $list;
+	}
+	
+	public function getStaffByCidAll($cid = 0){
+		$list = $this->find ( array (
+				'asc' => 'sid',
+				'where' => "cid= '" . $cid . "' ",
+				'asArray' => TRUE
+		) );
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 5 );
+		Doo::loadModel ( 'position' );
+		$position = new position ();
+		
+		foreach ( $list as $key => $value ) {
+			$list [$key] ['sidKey'] = $XDeode->encode ( $value ['sid'] );
+				
+			$list [$key] ['position'] ='';
+			$pdetail=$position->getPositionByPid($value['positionId']);
+			if (!empty($pdetail))
+				$list [$key] ['position'] =$pdetail['positionName'];
+					
 		}
-
 		return $list;
 	}
 	
@@ -372,7 +409,7 @@ class staff extends DooModel {
 		$list = $this->find ( array (
 				'asc' => 'sid',
 			
-				'where' => "(pendStatus= '2' or pendStatus='3' or pendStatus='5' or pendStatus='6') and (pendingApprovals ='" . $sid . "' or pendingApprovalsLeave='" . $sid . "')",
+				'where' => "(pendStatus= '2' or pendStatus='3' or pendStatus='5' or pendStatus='6' or pendStatus='7') and (pendingApprovals ='" . $sid . "' or pendingApprovalsLeave='" . $sid . "')",
 				'asArray' => TRUE
 		) );
 		Doo::loadClass ( 'XDeode' );
@@ -538,7 +575,7 @@ class staff extends DooModel {
 	public function getStaffBySid($sid = 0) {
 		Doo::loadClass ( 'XDeode' );
 		$XDeode = new XDeode ( 5 );
-		if (!is_numeric($sid)){
+		if (!is_numeric($sid)&&!empty($sid)){
 			
 			$sid = $XDeode->decode ( $sid );
 		}

protected/plugin/TemplateTag.php

@@ -269,6 +269,23 @@ function isInvoiceCategoryShow($sid){
 }
 
 /**
+ * 是否有查看日常收支的权限
+ */
+function isPaymentsShow($sid){
+	Doo::loadModel ( "execute" );
+	$execute = new execute ();
+	
+	$list = $execute->find ( array (
+			'where' => '(staff like \'%["' . $sid . '%\'  ) and mold="日常收支"',
+				'asArray' => true
+		) );
+	if (empty($list))
+		return false;
+	else 
+		return true;
+}
+
+/**
  * 是否有查看应收款的权限
  * @param unknown $sid
  */

protected/view/admin/adminCarriedout.html

@@ -25,6 +25,7 @@
 						<li><a href="/adminRole">审批角色</a></li>
 						<li class="active" ><a href="/adminExecute">费用执行人</a></li>
 						<li ><a href="/adminReceiptAuthority">汇总权限</a></li>
+						<li><a href="/adminPaymentsAuthority">日常收支权限</a></li>
 					</ul>
 				</div>
 					<legend>编辑执行人</legend><form method="post" action="/addCategory" name="group">

protected/view/admin/adminReceiptAuthority.html

@@ -31,6 +31,7 @@
 						<li><a href="/adminExecute">费用执行人</a></li>
 					
 						<li class="active"><a href="/adminReceiptAuthority">汇总权限</a></li>
+						<li ><a href="/adminPaymentsAuthority">日常收支权限</a></li>
 					</ul>
 				</div>
 					<form>

protected/view/admin/expenses.html

@@ -19,6 +19,9 @@
 				</div>
 			</div>
 			<div class="adminContent autoHeight" style="height: 821px;">
+			
+			
+			
 				<legend><div class="fR"></div>以下是您的费用</legend>
 				<div class="demandCate">
 				<form action="/expenses" id="up" method="post">

protected/view/admin/expensesDoc.html

@@ -54,6 +54,9 @@
 	  					
 	  					<table class="table table-bordered table-condensed table-hover">
 							<tbody>
+							<tr><th class="taC" colspan="2">费用说明</th>
+							</tr><tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+							
 							<tr><th colspan="2" class="taC">借款费用</th></tr>
 							
 							<!-- loop receiptList' value.loanItem.借款费用 -->
@@ -63,8 +66,7 @@
 							
 							<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 							<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
-							<tr><th class="taC" colspan="2">费用说明</th>
-							</tr><tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+							
 							
 							<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次费用合计</b></td>
 							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td></tr>
@@ -74,6 +76,9 @@
 						<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
 	  					
+	  					<tr><th class="taC" colspan="2">报销说明</th></tr>
+	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  					
 	  						<tr><th colspan="2" class="taC">日常相关费用</th></tr>
 	  						<!-- loop receiptList' value.accountItem.日常相关费用 -->
 	  							<tr><th>{{receiptList' value' value.name}}</th><td width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
@@ -136,8 +141,7 @@
 							<!-- endif -->
 	  						
 	  						
-	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
-	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  						
 	  						
 	  						
 	  						<tr><th class="taC" colspan="2">附件</th>
@@ -169,6 +173,10 @@
 	  					
 	  					<table class="table table-bordered table-condensed table-hover">
 							<tbody>
+							
+							<tr><th class="taC" colspan="2">费用说明</th>
+							</tr><tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+							
 							<tr><th colspan="2" class="taC">借款费用</th></tr>
 							
 							<!-- loop receiptList' value.loanItem.借款费用 -->
@@ -208,8 +216,7 @@
 							<!-- endif -->
 							
 							
-							<tr><th class="taC" colspan="2">费用说明</th>
-							</tr><tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+							
 							
 							<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次费用合计</b></td>
 							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.sumCN}}</td></tr>
@@ -317,6 +324,9 @@
 	  					<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
 	  					
+	  					<tr><th class="taC" colspan="2">报销说明</th></tr>
+	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  					
 	  						<tr><th colspan="2" class="taC">办事处相关费用</th></tr>
 	  						<!-- loop receiptList' value.accountItem.日常相关费用 -->
 	  							<tr><th>{{receiptList' value' value.name}}</th><td width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
@@ -357,8 +367,7 @@
 	  						
 	  						
 	  						
-	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
-	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  						
 	  						
 	  						<tr><th class="taC" colspan="2">附件</th>
 	  						</tr>
@@ -472,7 +481,8 @@
 	  				<div class="seTable">
 	  					<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
-	  					
+	  					<tr><th class="taC" colspan="2">报销说明</th></tr>
+	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
 	  						<tr><th colspan="2" class="taC">日常相关费用</th></tr>
 	  						<!-- loop receiptList' value.accountItem.日常相关费用 -->
 	  							<tr><th>{{receiptList' value' value.name}}</th><td width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
@@ -535,8 +545,7 @@
 							<!-- endif -->
 	  						
 	  						
-	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
-	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  						
 	  						
 	  						<tr><th class="taC" colspan="2">附件</th>
 	  						</tr>

protected/view/admin/expensesEdi.html

@@ -20,6 +20,8 @@
 			</div>
 			<div class="adminContent autoHeight" style="height: 821px;">
 				
+				<div class="borad-news">
+				
 				<legend><div class="fR"></div>
 				<!-- if {{status}}==2  -->
 				费用审批
@@ -60,6 +62,11 @@
 					
 						<table class="table table-bordered table-condensed table-hover">
 							<tbody>
+							
+							<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.BIGsum}}</td></tr>
+							
+							
 							<tr><th colspan="2" class="taC">借款费用</th></tr>
 							
 							<!-- loop receiptList' value.loanItem.借款费用 -->
@@ -102,8 +109,6 @@
 							<tr><th class="taC" colspan="2">费用说明</th>
 							</tr><tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
 							
-							<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
-	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.BIGsum}}</td></tr>
 							
 							</tbody>
 						</table>
@@ -116,6 +121,10 @@
 	  					<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
 	  						
+	  						<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br/>
+	  						{{receiptDetail' value.BIGsum}}</td></tr>
+	  						
 	  						<tr><th colspan="2" class="taC">日常相关费用</th></tr>
 	  						<!-- loop receiptList' value.accountItem.日常相关费用 -->
 	  							<tr><th>{{receiptList' value' value.name}}<div class="repMark fR"><i class="rmDone">●</i><i class="rmUdone">●</i><i class="rmClear">●</i></div></th><td  width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
@@ -205,9 +214,7 @@
 	  						</td></tr>
 	  						
 	  						
-	  						<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
-	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br/>
-	  						{{receiptDetail' value.BIGsum}}</td></tr>
+	  						
 
 						</tbody>
 	  					</table>
@@ -313,6 +320,10 @@
 	  		
 	  			
 	  		</div>
+	  		
+	  		</div>
+	  		
+	  		
 			</div>
 		</div>
 	</div>

protected/view/admin/invoiceAggregateCompanyDetail.html

@@ -85,7 +85,7 @@
 					});</script>
 					<table class="table table-bordered table-condensed table-hover fancyTable" id="invoiceTable">
 						<thead>
-							<tr><th class="taC">开票流水号</th><th class="taC">开票金额</th><th class="taC">开票单位（抬头）</th><th class="taC">开票内容</th><th class="taC">收款流水号</th><th class="taC">收款金额</th><th class="taC">应收款金额</th><th class="taC">申请人</th><th class="taC">出票时间</th></tr>
+							<tr><th class="taC">开票流水号</th><th class="taC">开票金额</th><th class="taC">开票单位（抬头）</th><th class="taC">开票内容</th><th class="taC">发票号</th><th class="taC">收款流水号</th><th class="taC">收款金额</th><th class="taC">应收款金额</th><th class="taC">申请人</th><th class="taC">出票时间</th></tr>
 						</thead>
 						<tbody>
 						
@@ -108,6 +108,7 @@
 	                                    <!-- endif -->
 							</td>
 						<td>{{list' value.invoiceElement}}</td>
+						<td>{{list' value.invoiceNo}}</td>
 						<td>
 							<!-- loop list' value.irList -->
 							<a href="#billing" node-invoice='INFO' data-type="receivables" data-isKey="{{list' value' value.iridKeyK}}" data-toggle="modal">{{list' value' value.receivablesSerial}}</a>&nbsp;

protected/view/admin/receipt_menu.html

@@ -5,9 +5,9 @@
 	<li><a href="/personalCollect" <!-- if {{receiptMemu}}=="personalCollect" --> class="selected" <!-- endif --> >费用汇总</a></li>
 						
 						
-						
-<li><a href="/payments" <!-- if {{receiptMemu}}=="payments" --> class="selected" <!-- endif --> >日常收支</a></li>
-						
+<!-- if isPaymentsShow({{staff.0.sid}}) -->						
+<li><a href="/payments" <!-- if {{receiptMemu}}=="payments" --> class="selected" <!-- endif -->  >日常收支</a></li>
+<!-- endif -->						
 						
 	<!-- if inarray({{staff.0.sid}},{{verifyId}}) || inarray({{staff.0.sid}},{{executeId}}) -->
 						

protected/view/admin/receiptburEdi.html

@@ -19,7 +19,7 @@
 				</div>
 			</div>
 			<div class="adminContent autoHeight" style="height: 821px;">
-				
+				<div class="borad-news">
 				<legend><div class="fR"></div>
 				费用审批
 				</legend>
@@ -46,6 +46,13 @@
 	  			
 	  			<table class="table table-bordered table-condensed table-hover">
 							<tbody>
+							<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次费用合计</b></td>
+							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+							</tr>
+							
+							<tr><th class="taC" colspan="2">费用说明</th>
+							</tr><tr><td colspan="2">{{explanation}}</td></tr>
+							
 							<tr><th colspan="2" class="taC">借款费用</th></tr>
 							
 							<!-- loop receiptList' value.loanItem.借款费用 -->
@@ -54,12 +61,9 @@
 							
 							<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 							<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
-							<tr><th class="taC" colspan="2">费用说明</th>
-							</tr><tr><td colspan="2">{{explanation}}</td></tr>
 							
-							<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次费用合计</b></td>
-							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
-							</tr>
+							
+							
 							
 							<tr class="warning" style="display:none"><td class="taR"><b>确认汇款金额</b></td>
 							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
@@ -73,7 +77,19 @@
 	  					
 	  					<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
+	  					
+	  					<tr class="warning">
+	  						<td class="taR"><b>本次借款</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+	  						</tr>
 	  						
+	  						<tr class="warning"><td class="taR"><b>本次报销金额</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.sumCN}}</td></tr>
+							<tr <!-- if {{receiptDetail' value.relust}}>=0 --> class="success" <!-- else --> class="error" <!-- endif --> ><td class="taR"><b>差额</b></td>
+	  						<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.relust}}</b><br>{{receiptDetail' value.relustCN}}</td></tr>
+	  					
+	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
+	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
 	  						<tr><th colspan="2" class="taC">日常相关费用</th></tr>
 	  						<!-- loop receiptList' value.accountItem.日常相关费用 -->
 	  							<tr><th>{{receiptList' value' value.name}}<div class="repMark fR"><i class="rmDone">●</i><i class="rmUdone">●</i><i class="rmClear">●</i></div></th><td  width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
@@ -146,8 +162,7 @@
 							<!-- endif -->
 	  						
 	  						
-	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
-	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  						
 	  						
 	  						<tr><th class="taC" colspan="2">附件</th>
 	  						</tr>
@@ -157,15 +172,7 @@
 	  						
 	  						</td></tr>
 	  						
-	  						<tr class="warning">
-	  						<td class="taR"><b>本次借款</b></td>
-	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
-	  						</tr>
 	  						
-	  						<tr class="warning"><td class="taR"><b>本次报销金额</b></td>
-	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.sumCN}}</td></tr>
-							<tr <!-- if {{receiptDetail' value.relust}}>=0 --> class="success" <!-- else --> class="error" <!-- endif --> ><td class="taR"><b>差额</b></td>
-	  						<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.relust}}</b><br>{{receiptDetail' value.relustCN}}</td></tr>
 						</tbody>
 	  					</table>
 	  				
@@ -176,6 +183,12 @@
 	  					<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
 	  						
+	  						<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b></td></tr>
+	  						
+	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
+	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  						
 	  						<tr><th colspan="2" class="taC">日常相关费用</th></tr>
 	  						<!-- loop receiptList' value.accountItem.日常相关费用 -->
 	  							<tr><th>{{receiptList' value' value.name}}<div class="repMark fR"><i class="rmDone">●</i><i class="rmUdone">●</i><i class="rmClear">●</i></div></th><td  width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
@@ -253,8 +266,7 @@
 	  						
 	  						
 	  						
-	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
-	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  						
 	  						
 	  						<tr><th class="taC" colspan="2">附件</th>
 	  						</tr>
@@ -265,8 +277,7 @@
 	  						</td></tr>
 	  						
 	  						
-	  						<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
-	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b></td></tr>
+	  						
 
 						</tbody>
 	  					</table>
@@ -383,16 +394,10 @@
 	  				
 	  			</div>
 	  		<!-- endloop -->
+	  		</div>
 	  		
-	  		
-	  		
-	  		
-	  			
-	  			
-	  			
-	  			
-	  			
 	  		</div>
+	  		
 			</div>
 		</div>
 	</div>

protected/view/admin/remitApproval.html

@@ -20,6 +20,8 @@
 			</div>
 			<div class="adminContent autoHeight" style="height: 821px;">
 				
+				<div class="borad-news">
+				
 				<legend><div class="fR"></div>
 				费用审批
 				</legend>
@@ -45,6 +47,11 @@
 	  					
 	  					<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
+	  						<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br/>{{receiptDetail' value.BIGsum}}</td></tr>
+	  						
+	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
+	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
 	  						
 	  						<tr><th colspan="2" class="taC">日常相关费用</th></tr>
 	  						<!-- loop receiptList' value.accountItem.日常相关费用 -->
@@ -101,8 +108,7 @@
 							</td></tr>
 							<!-- endif -->
 	  						
-	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
-	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  						
 	  						
 	  						<tr><th class="taC" colspan="2">附件</th>
 	  						</tr>
@@ -112,9 +118,7 @@
 	  						
 	  						</td></tr>
 	  						
-	  						<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
-	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br/>{{receiptDetail' value.BIGsum}}</td></tr>
-
+	  						
 						</tbody>
 	  					</table>
 	  					
@@ -213,6 +217,9 @@
 	  		
 	  			
 	  		</div>
+	  		
+	  		</div>
+	  		
 			</div>
 		</div>
 	</div>

protected/view/header.html

@@ -13,5 +13,5 @@
 </head>
 
 <!-- if isStaffCompleteMsg() -->
-<!-- include '/setting/staffMsg' -->
+<!-- include './setting/staffMsg' -->
 <!-- endif -->

protected/view/humanResource/employeeApprovals.html

@@ -24,6 +24,8 @@
 					  <li><a href="/leaveOfficeApprovals">离职审批</a></li>
 					  <li><a href="/regularApprovals">转正审批</a></li>
 					  <li><a href="/promoteApprovals">晋升审批</a></li>
+					  <li><a href="/reentryApprovals">再入职审批</a></li>
+					  
 					</ul>
 				</div>
 				<!--入职审批-->

protected/view/humanResource/hr.html

@@ -47,6 +47,8 @@
 									待转正
 									<!-- elseif {{staffList' value.pendStatus}}==6 -->
 									待晋升
+									<!-- elseif {{staffList' value.pendStatus}}==7 -->
+									待再入职
 									<!-- endif -->
 									</td>
 									<td>
@@ -58,6 +60,8 @@
 									<a class="button btn-block" node-approvalsRegular node-sidKey="{{staffList' value.sidKey}}" href="#approvalRegular" data-toggle="modal">转正审批</a>
 									<!-- elseif {{staffList' value.pendStatus}}==6 -->
 									<a class="button btn-block" node-approvalsPromote node-sidKey="{{staffList' value.sidKey}}" href="#approvalPromote" data-toggle="modal">晋升审批</a>
+									<!-- elseif {{staffList' value.pendStatus}}==7 -->
+									<a class="button btn-block" node-approvalsReentry node-sidKey="{{staffList' value.sidKey}}" href="#approvalReentry" data-toggle="modal">再入职审批</a>
 									<!-- endif -->
 									</td>
 									</tr>
@@ -200,6 +204,30 @@
 		</form>
 	</div>
 	
+	<!--弹出（审批员工再入职）-->
+	<div class="modal hide fade" id="approvalReentry">
+	<form method="post" action="/employeeReentryApprovals" name="group">
+	<input type="hidden" name="sidKey" id='sidKeyReentry'  value="">
+		
+		<div class="modal-dialog modal-xlg">
+			<div class="modal-content">
+			<div class="modal-header">
+					<h3>员工晋升审批</h3>
+				</div>
+			<div id='staffDetailReentry'>
+			</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>
+		</form>
+	</div>
+	
 	<!--弹出（更新员工信息）-->
 	<div class="modal hide fade" id="employeeInfo">
 	<form method="post" action="/staffUpdate" id="staffUpdate">

protected/view/humanResource/hrEmployee.html

@@ -386,7 +386,7 @@
 	</div>
 	<!--弹出（员工再入职）-->
 	<div class="modal hide fade" id="do-return">
-	<form  action="/employeeReentry" method="post" id="staffReentry" >
+	<form  action="/employeeReentryApply" method="post" id="staffReentry" >
 		<input type="hidden" name="sidKey" id='sidKeyReentry'  value="">
 		<div class="modal-dialog">
 			<div class="modal-content">
@@ -413,7 +413,7 @@
 						</tr>
 						
 					</table>
-					<p class="alert">确认该员工再入职。</p>
+					<p class="alert">申请该员工再入职。</p>
 				</div>
 				<div class="modal-footer">
 					<input type="submit" class="button" value="确定">

protected/view/mail_create.html

@@ -46,16 +46,37 @@
 							            <table style="background-color:#fff;border:1px solid #ddd;border-bottom:0px;border-top:0px;width:100%;" cellpadding="0" cellspacing="0" align="left">
 							             <tbody>
 							              <tr>
-							               <td style="padding: 0 40px;" align="left"><p style="margin-top:40px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;"><b></b>，您好</p></td>
+							               <td style="padding: 0 40px;" align="left"><p style="margin-top:40px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;"><b></b></p></td>
 							              </tr>
 							              <tr>
 							               <td style="padding: 0 40px;" align="left">
-							               	<p style="margin-top:0px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;">我是纵横公路造价软件 <b>{{staff.0.username}}</b>：</p>
+							               	<p style="margin-top:0px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;">您好，我是纵横公路造价软件 <b>{{staff.0.username}}</b>：</p>
 							               	<p name="contentHtml" style="margin-top:0px;margin-bottom:20px;color:#383838;font-size:16px;line-height:32px;">*邮件的正文内容将会出现在这里，右侧填写后可直接预览。</p>
 							               </td>
 							              </tr>
 							              <tr>
-							               <td style="padding: 20px 40px;border-top:1px dashed #ddd" align="left">
+							              	<td style="padding: 10px 0 0;background:#F6F6F6;">
+              <table>
+                <tr>
+                  <td style="font-size:14pxl;color:#666;padding:0 20px"><b>纵横软件公司{{staff.0.category}}服务中心</b><br>{{staff.0.username}}<br><a href="http://www.smartcost.com.cn" style="color:#666;font-size:12px;text-decoration:underline;">smartcost.com.cn</a></td>
+                  <td>
+                    <table>
+                    <tr style="font-size:12px;color:#666">
+                      <th align="right">电话：</th><td style="padding:0 20px 0 0">{{staff.0.phone}}</td>
+                      <th align="right">手机：</th><td>{{staff.0.telephone}}</td>
+                    </tr>
+                    <tr style="font-size:12px;color:#666">
+                      <th align="right">Q Q：</th><td>{{staff.0.qq}}</td>
+                      <th align="right">邮箱： </th><td>{{staff.0.email}}</td>
+                      </tr>
+                  </table>
+                  </td>
+                </tr>
+              </table>
+
+             </td>
+
+							               <!-- <td style="padding: 20px 40px;border-top:1px dashed #ddd" align="left">
 							               <p style="margin-bottom:10px;color:#383838;font-size:16px;line-height:22px;border-left:2px solid #FF6501;padding-left:5px">纵横公路造价软件{{staff.0.category}}办事处</p>
 							               <table>
 							               	<tr><th align="right">电话：</th><td>{{staff.0.phone}}</td></tr>
@@ -63,7 +84,7 @@
 							               	<tr><th align="right">手机：</th><td>{{staff.0.telephone}}</td></tr>
 							               	<tr><th align="right">QQ：</th><td>{{staff.0.qq}}</td></tr>
 							               	<tr><th align="right">邮箱：</th><td>{{staff.0.email}}</td></tr>
-							               </table></td>
+							               </table></td> -->
 							              </tr>
 							             </tbody>
 							            </table>
@@ -106,29 +127,31 @@
 							            </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></b>，您好</p>
-							             <p style="margin-top:0px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;">我是纵横公路造价软件 <b>{{staff.0.username}}</b>：</p>
+							             <p style="margin-top:0px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;"><b></b></p>
+							             <p style="margin-top:0px;margin-bottom:10px;color:#383838;font-size:16px;line-height:32px;">您好，我是纵横公路造价软件 <b>{{staff.0.username}}</b>：</p>
 							             <p name="contentHtml" style="margin-top:0px;margin-bottom:15px;color:#383838;font-size:16px;line-height:32px;">*邮件的正文内容将会出现在这里，右侧填写后可直接预览。</p></td>
 							            </tr>
 							            <tr>
-							             <td style="padding: 10px 0;background:#EEF2F5">
-							             	<table>
-							             		<tbody><tr>
-							             			<td style="font-size:14pxl;color:#333;padding:0 20px"><b>纵横公路造价软件{{staff.0.category}}办事处</b><br>{{staff.0.username}}</td>
-							             			<td>
-							             				<table>
-							             				<tbody><tr style="font-size:12px;color:#666">
-							             					<th align="right">电话：</th><td style="padding:0 20px 0 0">{{staff.0.phone}}</td>
-							             					<th align="right">手机：</th><td>{{staff.0.telephone}}</td>
-							             				</tr>
-							             				<tr style="font-size:12px;color:#666">
-							             					<th align="right">QQ：</th><td>{{staff.0.qq}}</td>
-							             					<th align="right">邮箱：	</th><td>{{staff.0.email}}</td>
-							             					</tr>
-							             			</tbody></table>
-							             			</td>
-							             		</tr>
-							             	</tbody></table></td></tr></tbody>
+							             <td style="padding: 10px 0 0;background:#F6F6F6;">
+              <table>
+                <tr>
+                  <td style="font-size:14pxl;color:#666;padding:0 20px"><b>纵横软件公司{{staff.0.category}}服务中心</b><br>{{staff.0.username}}<br><a href="http://www.smartcost.com.cn" style="color:#666;font-size:12px;text-decoration:underline;">smartcost.com.cn</a></td>
+                  <td>
+                    <table>
+                    <tr style="font-size:12px;color:#666">
+                      <th align="right">电话：</th><td style="padding:0 20px 0 0">{{staff.0.phone}}</td>
+                      <th align="right">手机：</th><td>{{staff.0.telephone}}</td>
+                    </tr>
+                    <tr style="font-size:12px;color:#666">
+                      <th align="right">Q Q：</th><td>{{staff.0.qq}}</td>
+                      <th align="right">邮箱： </th><td>{{staff.0.email}}</td>
+                      </tr>
+                  </table>
+                  </td>
+                </tr>
+              </table>
+
+             </td></tr></tbody>
 							          </table></td></tr><tr>
 									<td style="padding: 0 40px;background-color:#383838;"><p style="color:#fff;padding:10px 0;text-align:center;margin:0;font-size:12px">珠海纵横创新软件有限公司 <a href="http://www.smartcost.com.cn" style="color:#fff;text-decoration:underline;">smartcost.com.cn</a></p></td>
 							        </tr>
@@ -162,31 +185,31 @@
 				            </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:#666;font-size:16px;line-height:32px;"><b></b>，您好</p>
-				             <p style="margin-top:0px;margin-bottom:10px;color:#666;font-size:16px;line-height:32px;">我是纵横公路造价软件 <b>{{staff.0.username}}</b>：</p>
+				             <p style="margin-top:0px;margin-bottom:10px;color:#666;font-size:16px;line-height:32px;"><b></b></p>
+				             <p style="margin-top:0px;margin-bottom:10px;color:#666;font-size:16px;line-height:32px;">你好，我是纵横公路造价软件 <b>{{staff.0.username}}</b>：</p>
 				             <p name="contentHtml" style="margin-top:0px;margin-bottom:15px;color:#666;font-size:16px;line-height:32px;">*邮件的正文内容将会出现在这里，右侧填写后可直接预览。</p></td>
 				            </tr>
 				            <tr>
 				             <td style="padding: 10px 0 0;background:#F6F6F6;">
-				              <table>
-				                <tbody><tr>
-				                  <td style="font-size:14pxl;color:#666;padding:0 20px"><b>纵横公路造价软件{{staff.0.category}}办事处</b><br>{{staff.0.username}}<br><a href="http://www.smartcost.com.cn" style="color:#666;font-size:12px;text-decoration:underline;">smartcost.com.cn</a></td>
-				                  <td>
-				                    <table style="width:100%">
-				             				<tbody><tr style="font-size:12px;color:#496781">
-				             					<th align="right">电话：</th><td>{{staff.0.phone}}</td>
-				             					<th align="right">手机：</th><td>{{staff.0.telephone}}</td>
-				             				</tr>
-				             				<tr style="font-size:12px;color:#496781">
-				             					<th align="right">QQ：</th><td>{{staff.0.qq}}</td>
-				             					<th align="right">邮箱：	</th><td>{{staff.0.email}}</td>
-				             					</tr>
-				             			</tbody></table>
-				                  </td>
-				                </tr>
-				              </tbody></table>
-				
-				             </td>
+              <table>
+                <tr>
+                  <td style="font-size:14pxl;color:#666;padding:0 20px"><b>纵横软件公司{{staff.0.category}}服务中心</b><br>{{staff.0.username}}<br><a href="http://www.smartcost.com.cn" style="color:#666;font-size:12px;text-decoration:underline;">smartcost.com.cn</a></td>
+                  <td>
+                    <table>
+                    <tr style="font-size:12px;color:#666">
+                      <th align="right">电话：</th><td style="padding:0 20px 0 0">{{staff.0.phone}}</td>
+                      <th align="right">手机：</th><td>{{staff.0.telephone}}</td>
+                    </tr>
+                    <tr style="font-size:12px;color:#666">
+                      <th align="right">Q Q：</th><td>{{staff.0.qq}}</td>
+                      <th align="right">邮箱： </th><td>{{staff.0.email}}</td>
+                      </tr>
+                  </table>
+                  </td>
+                </tr>
+              </table>
+
+             </td>
 				            </tr>
 				        <tr>
 				          <td style="background:#F6F6F6 url('http://zonghengvideo.qiniudn.com/mail3-bottom-bg.png') no-repeat bottom center;"><p style="color:#fff;padding:0 0 20px;text-align:center;margin:0;font-size:12px"></p></td>
@@ -237,28 +260,26 @@
 				             <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>
 				            </tr>
 				      	        <tr>
-				             <td style="padding: 10px 0;">
-				             	<table style="width:100%">
-				             		<tbody><tr>
-				             			<td style="font-size:14pxl;color:#496781;padding:0 20px" align="center"><b>纵横公路造价软件{{staff.0.category}}办事处</b><br>{{staff.0.username}}</td>
-				             			</tr>
-				             			<tr>
-				             			<td>
-				             				<table style="width:100%">
-				             				<tbody><tr style="font-size:12px;color:#496781">
-				             					<th align="right">电话：</th><td>{{staff.0.phone}}</td>
-				             					<th align="right">手机：</th><td>{{staff.0.telephone}}</td>
-				             				</tr>
-				             				<tr style="font-size:12px;color:#496781">
-				             					<th align="right">QQ：</th><td>{{staff.0.qq}}</td>
-				             					<th align="right">邮箱：	</th><td>{{staff.0.email}}</td>
-				             					</tr>
-				             			</tbody></table>
-				             			</td>
-				             		</tr>
-				             	</tbody></table>
-				
-				             </td>
+				             <td style="padding: 10px 0 0;background:#F6F6F6;">
+              <table>
+                <tr>
+                  <td style="font-size:14pxl;color:#666;padding:0 20px"><b>纵横软件公司{{staff.0.category}}服务中心</b><br>{{staff.0.username}}<br><a href="http://www.smartcost.com.cn" style="color:#666;font-size:12px;text-decoration:underline;">smartcost.com.cn</a></td>
+                  <td>
+                    <table>
+                    <tr style="font-size:12px;color:#666">
+                      <th align="right">电话：</th><td style="padding:0 20px 0 0">{{staff.0.phone}}</td>
+                      <th align="right">手机：</th><td>{{staff.0.telephone}}</td>
+                    </tr>
+                    <tr style="font-size:12px;color:#666">
+                      <th align="right">Q Q：</th><td>{{staff.0.qq}}</td>
+                      <th align="right">邮箱： </th><td>{{staff.0.email}}</td>
+                      </tr>
+                  </table>
+                  </td>
+                </tr>
+              </table>
+
+             </td>
 				            </tr>
 				        <tr>
 									<td style="padding: 0 40px;"><p style="color:#496781;padding:10px 0;text-align:center;margin:0;font-size:12px">珠海纵横创新软件有限公司 <a href="http://www.smartcost.com.cn" style="color:#496781;text-decoration:underline;">smartcost.com.cn</a></p></td>

protected/view/setting/settingMenu.html

@@ -3,6 +3,10 @@
 						<li><a href="admin-myinfo-borard.html">员工首页</a></li>
 					 -->	
 						<li><a href="/settingEmployeeInfo" <!-- if {{hrMemu}}=="settingEmployeeInfo" --> class="selected" <!-- endif --> >员工信息</a></li>
+						
+						
+						
 						<li><a <!-- if {{hrMemu}}=="notificationConf" --> class="selected" <!-- endif --> href="/notificationConf">微信通知</a></li>
 						<li><a href="/settingPW" <!-- if {{hrMemu}}=="settingPW" --> class="selected" <!-- endif --> target="">修改密码</a></li>
+						<li><a href="/settingAvatarInfo" <!-- if {{hrMemu}}=="settingAvatarInfo" --> class="selected" <!-- endif --> target="">修改头像</a></li>
 					</ul>