1

global/css/global.css

@@ -4182,4 +4182,17 @@ td div.dlLev3{
   color: #fff;
   padding: 5px 10px;
   border-radius:0 0 5px 5px;
+}
+pre{
+	 font-family:"微软雅黑","Tahoma" !important;
+   white-space: pre-wrap;
+}
+.gm-toolbar .pagination{
+  bottom: -17px !important;
+}
+.full-column-div{
+  margin: 10px 15px !important;
+}
+.full-column-div pre{
+  line-height: 20px !important;
 }

global/vue/fee/receipt_office_component.js

@@ -76,12 +76,12 @@ Vue.component("office", {
     <div class="seCensor receipt-censor">
         <div class="title">报销单填写说明</div>
         <div class="detail">
-            <p>1 办事处水电费标准100元，标准内实报；</p>
+            
             <p>
-                2 <b>产生费用所在办事处</b> 默认使用您所在的第一个办事处；
+                1 <b>产生费用所在办事处</b> 默认使用您所在的第一个办事处；
             </p>
             <p>
-                3 邮寄费、公关费、办公费等详细说明请填写到 <b>报销说明</b>。
+                2 邮寄费、公关费、办公费等详细说明请填写到 <b>报销说明</b>。
             </p>
         </div>
     </div>

global/vue/fee/receipt_trave_component.js

@@ -15,8 +15,12 @@ Vue.component("trave", {
             regionOption: region,
             // regionLeve2Option: region[0].child,
             // arrivalLeve2Option: region[0].child,
+            //新增下拉地区
             regionLeve2Option: region[defaultTraveProvinceIndex].child,
             arrivalLeve2Option: region[defaultTraveProvinceIndex].child,
+            //编辑下拉地区
+            regionLeve2OptionEdi: [],
+            arrivalLeve2OptionEdi: [],
 
             // 出发地 省 市
             // departureProvince: region[0].name,
@@ -183,10 +187,26 @@ Vue.component("trave", {
             // 出发地
             this.departureProvinceEdi = tripData.tripList[0].province;
             this.departureCityEdi = tripData.tripList[0].city;
+            
+            this.regionOption.forEach(el => {
+                if (el.name == this.departureProvinceEdi) {
+                    this.regionLeve2OptionEdi = el.child;
+                    return
+                }
+            });
+
+            //this.regionLeve2Option= tripData.tripList;
             // 结束
             let endIndex = tripData.tripList.length - 1
             this.arrivalProvinceEdi = tripData.tripList[endIndex].province;
             this.arrivalCityEdi = tripData.tripList[endIndex].city;
+            this.regionOption.forEach(el => {
+                if (el.name == this.arrivalProvinceEdi) {
+                    this.arrivalLeve2OptionEdi = el.child;
+                    return
+                }
+            });
+            //this.arrivalLeve2Option=tripData.tripList,
             // 目的地
             this.arrivalList = [];
             tripData.tripList.forEach((element, index) => {
@@ -206,6 +226,7 @@ Vue.component("trave", {
                     });
                 }
             });
+
         },
         ediTrip() {
             if (this.tripTime == "") {
@@ -470,7 +491,7 @@ Vue.component("trave", {
                                     <option v-for="option in regionOption" :value="option.name" >{{option.name}}</option>
                             </select>
                             <select v-model="departureCityEdi" @change="changeArrivalCity($event)">
-                                <option v-for="option in regionLeve2Option">{{option.name}}</option>
+                                <option v-for="option in regionLeve2OptionEdi">{{option.name}}</option>
                             </select>
                             <a href="javascript:void(0)" @click="addArrivalDom('edi')" >+添加目的地</a>
                         </td>
@@ -497,7 +518,7 @@ Vue.component("trave", {
                                 <option v-for="option in regionOption" :value="option.name" >{{option.name}}</option>
                             </select>
                             <select v-model="arrivalCityEdi">
-                                <option v-for="option in arrivalLeve2Option">{{option.name}}</option>
+                                <option v-for="option in arrivalLeve2OptionEdi">{{option.name}}</option>
                             </select>
                         </td>
                     </tr>

index.php

@@ -6,7 +6,7 @@ include './protected/config/db.conf.php';
 include './protected/config/acl.conf.php';
 
 #Just include this for production mode
-//include $config['BASE_PATH'].'deployment/deploy.php';
+// include $config['BASE_PATH'].'deployment/deploy.php';
 include $config['BASE_PATH'].'Doo.php';
 include $config['BASE_PATH'].'app/DooConfig.php';
 //echo $config['BASE_PATH'].'Doo.php';die;
@@ -16,7 +16,7 @@ include $config['BASE_PATH'].'app/DooConfig.php';
 Doo::conf()->set($config);
 
 # remove this if you wish to see the normal PHP error view.
-//include $config['BASE_PATH'].'diagnostic/debug.php';
+//  include $config['BASE_PATH'].'diagnostic/debug.php';
 
 Doo::acl()->rules=$acl;
 

protected/cache/staffCollect/staffCollect_2019_.htmls

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<html lang=zh-cn> 
-<head>
+<html lang=zh-cn xmlns="http://www.w3.org/1999/xhtml"> 
+<head  >
 	<meta charset=utf-8> 
 	<title>CLD.System</title> 
 	<link rel="shortcut icon" href="http://cld.com/global/images/favicon.ico"> 
@@ -9,9 +9,9 @@
 	<script src="http://cld.com/global/js/jquery-1.7.2.min.js"></script>
 	<script type="text/javascript" src="http://cld.com/global/js/jquery.infinitescroll.min.js"></script> 
 	<script src="http://cld.com/global/js/global.js"></script>
-	<script src="http://cld.com/global/js/index.js?1.07"></script></head>
+	<script src="http://cld.com/global/js/index.js?1.09"></script></head>
 
-<script type="text/javascript" src="http://cld.com/global/js/receipt.js?1.09"></script>
+<script type="text/javascript" src="http://cld.com/global/js/receipt.js?1.11"></script>
 <script type="text/javascript" >
 </script>
 <body>
@@ -22,12 +22,63 @@
 				<ul>
 					
 
+<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine">
+<a href="/" class="icon-  ">B</a>
+</li>
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录">
+<a href="/contacts" class="icon- ">A</a>
+</li>
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库">
+<a href="/keyonline" class="icon- ">C</a>
+</li>
+
+
+<li data-placement="right" data-toggle="ctooltip"  data-original-title="云版管理">
+<a href="/cloud/build/edition" target="_blank" class="icon- ">e</a>
+</li>
+
 
 <li  data-placement="right" data-toggle="ctooltip" class="topLine  news " data-original-title="费用管理"  >
 <a href="/saeaBorad" class="icon-  selected " >U</a>
 </li>  
 
-													</ul>
+<li data-placement="right" data-toggle="ctooltip"  data-original-title="发票申请">
+<a href="/invoice" class="icon- ">D</a>
+</li>
+
+
+
+<li data-placement="right" data-toggle="ctooltip"  class="news"  data-original-title="人资管理">
+<a href="/hr" class="icon- ">m</a>
+</li>
+
+
+
+
+
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理">
+    <a href="/myList" class="icon- ">X</a>
+</li>
+    
+<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广">  
+<a href="/eMailTask" class="icon- ">Z</a></li>    
+    
+<li data-placement="right" data-toggle="ctooltip" class="topLine" data-original-title="APP" >
+<a href="/app" class="icon- ">Y</a>
+</li>
+
+
+<li data-placement="right" style="display:none" data-toggle="ctooltip" data-original-title="个人设置" ><a href="/adminmyinfo" class="icon- " >F</a></li> 
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置" >
+<a href="/settingEmployeeInfo" class="icon- " >F</a>
+</li> 
+
+<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="/out" class="icon-">G</a></li>
+									</ul>
 			</div>
 		</div>
 		<div class="warpContent">
@@ -41,26 +92,102 @@
 	<li><a href="/personalCollect"  >费用汇总</a></li>
 						
 						
+						
+<li><a href="/payments"   >日常收支</a></li>
+						
+						
 							
-	<li  class="  news  "><a  href="/approvalExpenses/pendApproval">费用审批</a></li>
+	<li  class="topLine  ">
+	<a  href="/approvalExpenses/pendApproval">费用审批</a>
+	</li>
 						
 
 <li  class=""><a  href="/receiptWasteBook">费用流水</a></li>						
 						
 						
-		<li  class="news"  ><a  href="/hisImplement/receipts">费用执行</a></li>			
-		
+		<li  class="news"  ><a  href="/hisImplement">费用执行</a></li>			
+					
+	<li class="hide"><a  href="/remittanceHky">费用汇款</a></li>			
+
 	
+		<li><a href="/receiptTrainRevenue"  >培训班营收</a></li>
+	
+		<li><a href="/companyCategoryCollect"  class="selected"  >公司汇总</a></li>			
 	
 
-		<li><a href="/companyCategoryCollect"  class="selected"  >公司汇总</a></li>	
 	
-	<li><a href="/wasteBook"  >公司流水</a></li>		
+		
+	<li><a href="/paymentsCollect"  >日常收支汇总</a></li>
+	<li><a href="/wasteBook"  >公司流水</a></li>
+	<li><a href="/wasteBookReport"  >流水报表</a></li>
+		<li><a href="/view/fee"  >所有费用列表</a></li>
+		
+
 	
+	<li  >
+	<a ghToken  href="javascript:void(0)" data-toggle="modal">工会</a>
+	</li>
 	
+	<li class="topLine"><a href="#welcome" data-toggle="modal">使用帮助</a></li>
 
 	</ul>
+						<!--弹出邮寄-->
+<div class="modal fade" id="welcome">
+	<div class="modal-dialog">
+		<div class="modal-content">
+		    <div class="modal-header">
+		    <h3>欢迎使用费用管理（原报销单）</h3>
+		    </div>
+		    <div class="modal-body saeaList">
+		    	<p style="font-size:18px">请查阅以下文档，了解新的费用管理</p>
+		    	<br>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC colRed" width="100">费用管理简介<br>（必读）</th>
+						<td class="taC">
+						<a target="_Blank" href="http://cld.com/global/handbook/CLD费用管理简介.pdf">在线查阅《CLD费用管理简介》</a>
 						
+						</td>
+						<td class="taC"><a href="http://cld.com/global/handbook/CLD费用管理简介.docx">点击下载《CLD费用管理简介》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用申请人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用申请人使用教程.pdf">在线查阅《费用申请人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用申请人使用教程.docx">点击下载《费用申请人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用审批人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用审批人使用教程.pdf">在线查阅《费用审批人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用审批人使用教程.docx">点击下载《费用审批人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" width="100">费用执行人</th>
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用执行人使用教程.pdf">在线查阅《费用执行人使用手册》</a></td>
+						<td class="taC"><a href="http://cld.com/global/handbook/费用执行人使用教程.docx">点击下载《费用执行人使用手册》</a></td>
+					</tr>
+					</tbody>
+				</table>
+		    </div>
+			<div class="modal-footer">
+			    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+			</div>
+		</div>
+	</div>
+</div>
+    <!--邮寄-->	
 											</ul>
 				</div>
 			</div>
@@ -69,12 +196,20 @@
 				<div class="demandCate">
 					<form action="/staffCollect" id="up" method="post">
 <ul class="cateList">
-	<li><a href="/companyCategoryCollect">按办事处</a><a href="/staffCollect"
-		class="now">按员工</a></li>
+	<li>
+	<a href="/companyCategoryCollect">按办事处</a>
+	<a href="/receiptSummaryStatisticsByAgency" >办事处明细</a>
+	<a href="/staffCollect" class="now">按员工</a>
+	</li>
 	<li><select name="year" id="Y" onchange="receiptYear();">
-	  					<br />
-<b>Notice</b>:  Undefined index: dateHtml in <b>F:\smartcost\cldgh\protected\viewc\admin\saeaStaffCollectB.php</b> on line <b>31</b><br />
-	  					</select> 
+	  					<option  value="2014"  >2014</option>
+<option  value="2015">2015</option>
+<option  value="2016">2016</option>
+<option  value="2017">2017</option>
+<option  value="2018">2018</option>
+<option  selected  value="2019">2019</option>
+<option  value="2020">2020</option>
+<option  value="2021">2021</option>	  					</select> 
 	  					
 	  					
 	  					<select onchange="javascript:location.href=this.value;">
@@ -103,9 +238,9 @@
 	  					
 	  </li>
 
-	<li>报销总计：￥0</li>
-	<li>同意支付：<span class="colGreen">￥0</span></li>
-	<li>审批中：￥0</li>
+	<li>报销总计：￥220977.83</li>
+	<li>同意支付：<span class="colGreen">￥189258.11</span></li>
+	<li>审批中：￥31719.72</li>
 </ul>
 </form>
 	  		</div>
@@ -131,17 +266,17 @@
 	  						<th class="taC" width="110">总计</th>
 	  						</tr>
 	  							  						<tr>
-	  						<th rowspan="4">安徽办</th><td><a href="/staffCollectDetail/陈帅">陈帅</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  						<th rowspan="4">安徽办</th><td><a href="/staffCollectDetail/陈帅">陈帅</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">￥5050.00</td><td class="taR">￥9000.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥14050</b></td>	  						</tr>
 	  							  						<tr>
-	  						<td><a href="/staffCollectDetail/范月光">范月光</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  						<td><a href="/staffCollectDetail/范月光">范月光</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">￥300.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥300</b></td>	  						</tr>
 	  							  						<tr>
 	  						<td><a href="/staffCollectDetail/林森">林森</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 	  							  						<tr>
 	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
-				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
-				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
+				<td class="taR">￥5350</td><td class="taR">￥9000</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥14350</td>	  						</tr>
 	  							  						<tr>
-	  						<th rowspan="8">广东办</th><td><a href="/staffCollectDetail/刘飞">刘飞</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  						<th rowspan="8">广东办</th><td><a href="/staffCollectDetail/刘飞">刘飞</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">￥600.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥600</b></td>	  						</tr>
 	  							  						<tr>
 	  						<td><a href="/staffCollectDetail/王洪生">王洪生</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 	  							  						<tr>
@@ -156,8 +291,8 @@
 	  						<td><a href="/staffCollectDetail/纵横SC">纵横SC</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 	  							  						<tr>
 	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
-				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
-				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
+				<td class="taR">￥600</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥600</td>	  						</tr>
 	  							  						<tr>
 	  						<th rowspan="23">总部</th><td><a href="/staffCollectDetail/谭玉堂">谭玉堂</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 	  							  						<tr>
@@ -175,11 +310,11 @@
 	  							  						<tr>
 	  						<td><a href="/staffCollectDetail/麦心蓉">麦心蓉</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 	  							  						<tr>
-	  						<td><a href="/staffCollectDetail/陈特">陈特</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  						<td><a href="/staffCollectDetail/陈特">陈特</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">￥84909.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥84909</b></td>	  						</tr>
 	  							  						<tr>
 	  						<td><a href="/staffCollectDetail/任杰">任杰</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 	  							  						<tr>
-	  						<td><a href="/staffCollectDetail/蔡频">蔡频</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  						<td><a href="/staffCollectDetail/蔡频">蔡频</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">￥14500.00</td><td class="taR">￥1600.00</td><td class="taR">￥1530.00</td><td class="taR">￥1912.00</td><td class="taR">￥17836.11</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥37378.11</b></td>	  						</tr>
 	  							  						<tr>
 	  						<td><a href="/staffCollectDetail/王晶">王晶</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 	  							  						<tr>
@@ -191,7 +326,7 @@
 	  							  						<tr>
 	  						<td><a href="/staffCollectDetail/付青青">付青青</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 	  							  						<tr>
-	  						<td><a href="/staffCollectDetail/欧桃珍">欧桃珍</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  						<td><a href="/staffCollectDetail/欧桃珍">欧桃珍</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">￥600.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">￥999.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥1599</b></td>	  						</tr>
 	  							  						<tr>
 	  						<td><a href="/staffCollectDetail/温秀娟">温秀娟</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 	  							  						<tr>
@@ -201,16 +336,16 @@
 	  							  						<tr>
 	  						<td><a href="/staffCollectDetail/操作日志">操作日志</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 	  							  						<tr>
-	  						<td><a href="/staffCollectDetail/黄嘉玲">黄嘉玲</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
+	  						<td><a href="/staffCollectDetail/黄嘉玲">黄嘉玲</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">￥0.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 	  							  						<tr>
 	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
-				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
-				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
+				<td class="taR">￥15100</td><td class="taR">￥1600</td><td class="taR">￥1530</td><td class="taR">￥1912</td><td class="taR">￥103744.11</td><td class="taR">￥0</td>
+				<td class="taR">￥0</td><td class="taR">￥123886.11</td>	  						</tr>
 	  							  						
 	  						<tr><th></th>
 	  						<td class="taR">合计</td>
-	  						<td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen">￥0</td>							</tr>
-	  						<tr class="warning"><th></th><td class="taR"><b>全年费用合计</b></td><td colspan="13" class="colGreed taR"><b style="font-size:24px">￥0</b></td></tr>
+	  						<td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">￥21050</td><td class="taR">￥10600</td><td class="taR">￥1530</td><td class="taR">￥1912</td><td class="taR">￥103744.11</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen">￥138836.11</td>							</tr>
+	  						<tr class="warning"><th></th><td class="taR"><b>全年费用合计</b></td><td colspan="13" class="colGreed taR"><b style="font-size:24px">￥138836.11</b></td></tr>
 	  						</tbody>
 	  					</table>
 	  			</div>

protected/class/comm_cld.php

@@ -27,6 +27,26 @@ function GetDecryptId($id){
 	return $id;
 }
 
+function GetYear($year=""){
+	$dateHtml = "";
+	if(empty($year)){
+		$year= date ( "Y" );
+	}
+	$now = date ( "Y" );
+	for($YEARD = 2050; $YEARD >= 2004; $YEARD --) {
+			
+		if ($YEARD <= $now) {
+			$dateHtml .= '<option ';
+			if ($year == $YEARD) {
+				$dateHtml .= 'selected ';
+			}
+			$dateHtml .= 'value="' . $YEARD . '">' . $YEARD . '</option>';
+		}
+	}
+	
+	return $dateHtml;
+}
+
 function makeReceiptDataVersion1($receiptList){
 	//办事处费用
 	$receiptList[0]['officeJson']=json_decode($receiptList[0]['officeJson'],true);

protected/config/acl.conf.php

@@ -381,6 +381,12 @@ $acl ['EMAIL'] ['allow'] = array (
 		)
 );
 
+$acl ['DASHBOARD'] ['allow'] = array (
+		'dashboard_controller' => array (
+				'GetJsonDashboardSoftwareCount',
+		),
+);
+
 //费用
 $acl ['RECEIPTS'] ['allow'] = array (
 		'fee_controller' => array (
@@ -392,6 +398,15 @@ $acl ['RECEIPTS'] ['allow'] = array (
 				'PostLoanReceiptEdit',
 				'GetViewReceiptApproval',
 				'GetJsonTraveDateAll',
+				'GetViewFee',
+				'GetJsonFee',
+				'PostJsonStaffCategory',
+				'GetViewIncomeExpenses',
+				'GetJsonIncomeExpenses',
+				'GetViewIncomeCollect',
+				'GetJsonIncomeCollect',
+				'GetViewExpensesCollect',
+				'GetJsonExpensesCollect',
 		),
 		'ReceiptController' => array (
 				'saeaBorad',

protected/config/routes_receipt.php

@@ -8,6 +8,27 @@ $route['get']['/view/loan/receipt/edi/:receiptId'] = array('fee/fee_controller',
 $route['get']['/view/receipt/approval/:receiptId'] = array('fee/fee_controller', 'GetViewReceiptApproval','extension'=>'.html');
 
 $route['get']['/json/trave/date/all'] = array('fee/fee_controller', 'GetJsonTraveDateAll','extension'=>'.json');
+//报销单列表
+$route['get']['/view/fee'] = array('fee/fee_controller', 'GetViewFee','extension'=>'.html');
+
+$route['get']['/json/fee'] = array('fee/fee_controller', 'GetJsonFee','extension'=>'.json');
+$route['post']['/json/staff/category'] = array('fee/fee_controller', 'PostJsonStaffCategory','extension'=>'.json');
+
+// 日常收支列表
+$route['get']['/view/income/expenses'] = array('fee/fee_controller', 'GetViewIncomeExpenses','extension'=>'.html');
+$route['get']['/json/income/expenses'] = array('fee/fee_controller', 'GetJsonIncomeExpenses','extension'=>'.json');
+
+
+$route['get']['/view/income/collect'] = array('fee/fee_controller', 'GetViewIncomeCollect','extension'=>'.html');
+$route['get']['/json/income/collect'] = array('fee/fee_controller', 'GetJsonIncomeCollect','extension'=>'.json');
+$route['get']['/view/expenses/collect'] = array('fee/fee_controller', 'GetViewExpensesCollect','extension'=>'.html');
+$route['get']['/json/expenses/collect'] = array('fee/fee_controller', 'GetJsonExpensesCollect','extension'=>'.json');
+
+
+
+
+
+
 
 
 $route['post']['/receipt/create'] = array('fee/fee_controller', 'PostReceiptCreate');
@@ -15,4 +36,10 @@ $route['post']['/receipt/edit'] = array('fee/fee_controller', 'PostReceiptEdit')
 $route['post']['/loan/receipt/edit'] = array('fee/fee_controller', 'PostLoanReceiptEdit');
 
 
+
+//dashboard 相关
+$route['get']['/json/dashboard/software/count'] = array('fee/dashboard_controller', 'GetJsonDashboardSoftwareCount');
+
+
+
 ?>

protected/controller/InvoiceController.php

@@ -7,10 +7,13 @@
  * @namespace invoice
  * @package invoiceController
  */
+
+require "protected/services/invoice_service.php";
 class InvoiceController extends DooController {
 	public $staff;
 	public $NEW;
 	public $data;
+	public $invoiceService;
 	private $INVOICEKEY = "APPROVAL";
 	private $INVOICECOLLECTPATH = "protected/cache/invoiceCollect/";
 	private $ACTION = '';
@@ -109,7 +112,7 @@ class InvoiceController extends DooController {
 			die ( 'illegal request' );
 	}
 	function __construct() {
-		
+		$this->invoiceService = new invoice_service ();
 		//echo $routeRs ['1'];
 		//die('dd');
 		if (isset ( $_COOKIE ["staff"] )) {
@@ -1100,8 +1103,19 @@ class InvoiceController extends DooController {
 			$cidString .= $cidString . ',' . $this->staff [0] ['cid'];
 		}
 		
+// 		include Doo::conf ()->BASE_PATH . 'diagnostic/debug.php';
+//  		$itTodoList = $invoiceTraining->getInvoiceTrainingByTodo ( '', $cidString, $this->staff [0] ['sid'] );
+		//TODO 待完成入账培训班
+		$itTodoList=$this->invoiceService->getTrainByCategoryStaff(0,$cidString,$this->staff [0] ['sid']);
+// 		if($this->staff [0] ['sid']==94){
+// 			$itTodoList=$this->invoiceService->getTrainByCategoryStaff(0,$cidString,$this->staff [0] ['sid']);
+// 		}else{
+// 			$itTodoList = $invoiceTraining->getInvoiceTrainingByTodo ( '', $cidString, $this->staff [0] ['sid'] );
+// 		}
+//  		$itTodoList=$this->invoiceService->getTrainByCategoryStaff(0,$cidString,$this->staff [0] ['sid']);
+		
+		
 		
-		$itTodoList = $invoiceTraining->getInvoiceTrainingByTodo ( '', $cidString, $this->staff [0] ['sid'] );
 		$itedList = $invoiceTraining->getInvoiceTrainingByStatus ( 2, '', $cidString, $this->staff [0] ['sid'] );
 		$category = $lCategory->getCategory ();
 		
@@ -1192,6 +1206,7 @@ class InvoiceController extends DooController {
 	 * 培训班详情
 	 */
 	function invoiceTrainingDetail() {
+// 		include Doo::conf ()->BASE_PATH . 'diagnostic/debug.php';
 		$trainStatus = $this->get_args ( 'trainStatus' ) ? $this->get_args ( 'trainStatus' ) : "ALL";
 		
 		$itid = isset ( $this->params ['trainingKey'] ) ? $this->params ['trainingKey'] : "";
@@ -1266,6 +1281,9 @@ class InvoiceController extends DooController {
 		$con.=' a.invoiceForm=1 and ';
 		
 		$detail = $invoiceTraining->getInvoiceTrainingByItid ( $itid );
+		
+		
+// 		TODO 获得电子票
 		$isList = $invoiceStore->getinvoiceStoreByItid ( $itid, $con,1 );
 		//print_r($isList);
 		

protected/controller/MainController.php

@@ -1146,146 +1146,175 @@ class MainController extends DooController {
 		$statisticsGet = array_reverse ( $statisticsGet );
 		$statisticsDay = array_reverse ( $statisticsDay );
 		
+		
+		
 		// /
-		$districtCondition = "";
-		$topDistrict = $district->get_lvByid ( 0, 0 );
-		if (! empty ( $sid )) {
-			$s = $staff->getOne ( array (
-					'where' => ' sid=' . $sid,
-					'asArray' => true 
-			) );
-			
-			$l = $lcategory->find ( array (
-					'where' => ' cid in(' . $s ['cid'] . ')',
-					'asArray' => true 
-			) );
-			if (! empty ( $s ['othercid'] ))
-				$l = $lcategory->find ( array (
-						'where' => ' cid in(' . $s ['cid'] . ',' . $s ['othercid'] . ')',
-						'asArray' => true 
-				) );
-			
-			if (! empty ( $districtH )) {
-				$districtCondition = " and districtid like '" . $districtH . ",%'";
-				$sidCondition = "";
-				$topDistrict = $district->find ( array (
-						'where' => ' upid=' . $districtH,
-						'asArray' => true 
-				) );
-			} else {
-				$districtCondition = " and districtid like '" . $l [0] ['districtid'] . ",%'";
-				$sidCondition = "";
-				$topDistrict = $district->find ( array (
-						'where' => ' upid=' . $l [0] ['districtid'],
-						'asArray' => true 
-				) );
-			}
+// 		$districtCondition = "";
+// 		$topDistrict = $district->get_lvByid ( 0, 0 );
+// 		if (! empty ( $sid )) {
+// 			$s = $staff->getOne ( array (
+// 					'where' => ' sid=' . $sid,
+// 					'asArray' => true 
+// 			) );
+			
+// 			$l = $lcategory->find ( array (
+// 					'where' => ' cid in(' . $s ['cid'] . ')',
+// 					'asArray' => true 
+// 			) );
+// 			if (! empty ( $s ['othercid'] ))
+// 				$l = $lcategory->find ( array (
+// 						'where' => ' cid in(' . $s ['cid'] . ',' . $s ['othercid'] . ')',
+// 						'asArray' => true 
+// 				) );
 			
-			$str = array ();
-			foreach ( $l as $value ) {
-				array_push ( $str, $value ['districtid'] );
-			}
-			$str = implode ( ",", $str );
-			$data ['districtHtml'] = $district->find ( array (
-					'where' => ' id in (' . $str . ')',
-					'asArray' => true 
-			) );
-			$data ['districtH'] = $l [0] ['districtid'];
-			if (! empty ( $districtH ))
-				$data ['districtH'] = $districtH;
-		}
+// 			if (! empty ( $districtH )) {
+// 				$districtCondition = " and districtid like '" . $districtH . ",%'";
+// 				$sidCondition = "";
+// 				$topDistrict = $district->find ( array (
+// 						'where' => ' upid=' . $districtH,
+// 						'asArray' => true 
+// 				) );
+// 			} else {
+// 				$districtCondition = " and districtid like '" . $l [0] ['districtid'] . ",%'";
+// 				$sidCondition = "";
+// 				$topDistrict = $district->find ( array (
+// 						'where' => ' upid=' . $l [0] ['districtid'],
+// 						'asArray' => true 
+// 				) );
+// 			}
+			
+// 			$str = array ();
+// 			foreach ( $l as $value ) {
+// 				array_push ( $str, $value ['districtid'] );
+// 			}
+// 			$str = implode ( ",", $str );
+// 			$data ['districtHtml'] = $district->find ( array (
+// 					'where' => ' id in (' . $str . ')',
+// 					'asArray' => true 
+// 			) );
+// 			$data ['districtH'] = $l [0] ['districtid'];
+// 			if (! empty ( $districtH ))
+// 				$data ['districtH'] = $districtH;
+// 		}
 		
 		// Year(updatetime)=".date('Y')." and Month(updatetime)=".date('m')." and
-		if (! empty ( $sid ))
-			$districtClient = $action_log->find ( array (
-					'select' => 'city,province,COUNT(*) as count',
-					'where' => " date_sub(curdate(), INTERVAL 30 DAY) <= date(updatetime) and status=" . $status . $categoryCondition . $sidCondition . $districtCondition,
-					'groupby' => 'province',
-					'asArray' => true 
-			) );
-		else
-			$districtClient = $action_log->find ( array (
-					'select' => 'city,province,COUNT(*) as count',
-					'where' => " date_sub(curdate(), INTERVAL 30 DAY) <= date(updatetime) and status=" . $status . $categoryCondition . $sidCondition . $districtCondition,
-					'groupby' => 'city',
-					'asArray' => true 
-			) );
-		
-		$statisticsLend = array ();
-		$statisticsCompany = array ();
-		
-		if (! empty ( $sid )) {
-			foreach ( $topDistrict as $value ) {
-				$falgLend = $falgLongle = true;
-				foreach ( $districtClient as $v ) {
+// 		if (! empty ( $sid ))
+// 			$districtClient = $action_log->find ( array (
+// 					'select' => 'city,province,COUNT(*) as count',
+// 					'where' => " date_sub(curdate(), INTERVAL 30 DAY) <= date(updatetime) and status=" . $status . $categoryCondition . $sidCondition . $districtCondition,
+// 					'groupby' => 'province',
+// 					'asArray' => true 
+// 			) );
+// 		else
+// 			$districtClient = $action_log->find ( array (
+// 					'select' => 'city,province,COUNT(*) as count',
+// 					'where' => " date_sub(curdate(), INTERVAL 30 DAY) <= date(updatetime) and status=" . $status . $categoryCondition . $sidCondition . $districtCondition,
+// 					'groupby' => 'city',
+// 					'asArray' => true 
+// 			) );
+		
+			
+			
+// 		$statisticsLend = array ();
+// 		if (! empty ( $sid )) {
+// 			foreach ( $topDistrict as $value ) {
+// 				$falgLend = $falgLongle = true;
+// 				foreach ( $districtClient as $v ) {
 					
-					if ($value ['name'] == $v ['province']) {
-						array_push ( $statisticsLend, array (
-								'value' => $v ['count'],
-								'name' => $value ['name'] 
-						) );
-						$falgLend = false;
-						break;
-					}
-				}
-				if ($falgLend)
-					array_push ( $statisticsLend, array (
-							'value' => 0,
-							'name' => $value ['name'] 
-					) );
-			}
-		} else {
-			foreach ( $topDistrict as $value ) {
-				$falgLend = $falgLongle = true;
-				foreach ( $districtClient as $v ) {
+// 					if ($value ['name'] == $v ['province']) {
+// 						array_push ( $statisticsLend, array (
+// 								'value' => $v ['count'],
+// 								'name' => $value ['name'] 
+// 						) );
+// 						$falgLend = false;
+// 						break;
+// 					}
+// 				}
+// 				if ($falgLend)
+// 					array_push ( $statisticsLend, array (
+// 							'value' => 0,
+// 							'name' => $value ['name'] 
+// 					) );
+// 			}
+// 		} else {
+// 			foreach ( $topDistrict as $value ) {
+// 				$falgLend = $falgLongle = true;
+// 				foreach ( $districtClient as $v ) {
 					
-					if ($value ['name'] == $v ['city']) {
-						array_push ( $statisticsLend, array (
-								'value' => $v ['count'],
-								'name' => $value ['name'] 
-						) );
-						$falgLend = false;
-						break;
-					}
-				}
-				if ($falgLend)
-					array_push ( $statisticsLend, array (
-							'value' => 0,
-							'name' => $value ['name'] 
-					) );
-			}
-		}
+// 					if ($value ['name'] == $v ['city']) {
+// 						array_push ( $statisticsLend, array (
+// 								'value' => $v ['count'],
+// 								'name' => $value ['name'] 
+// 						) );
+// 						$falgLend = false;
+// 						break;
+// 					}
+// 				}
+// 				if ($falgLend)
+// 					array_push ( $statisticsLend, array (
+// 							'value' => 0,
+// 							'name' => $value ['name'] 
+// 					) );
+// 			}
+// 		}
+		
+		
+		
+		
 		// print_r($statisticsLend);die;
-		$natureList = $action_log->find ( array (
-				'select' => 'cid, COUNT(*) as count,nature',
-				'where' => " date_sub(curdate(), INTERVAL 30 DAY) <= date(updatetime) and status=" . $status . " and nature !=''" . $categoryCondition . $sidCondition . $districtCondition,
-				'groupby' => 'nature',
-				'asArray' => true 
-		) );
+// 		$natureList = $action_log->find ( array (
+// 				'select' => 'cid, COUNT(*) as count,nature',
+// 				'where' => " date_sub(curdate(), INTERVAL 30 DAY) <= date(updatetime) and status=" . $status . " and nature !=''" . $categoryCondition . $sidCondition . $districtCondition,
+// 				'groupby' => 'nature',
+// 				'asArray' => true 
+// 		) );
+		
+// 		$statisticsNature = array ();
+// 		foreach ( $this->nature as $value ) {
+// 			$flagNature = true;
+// 			foreach ( $natureList as $v ) {
+// 				if ($value == $v ['nature']) {
+// 					array_push ( $statisticsNature, array (
+// 							'value' => $v ['count'],
+// 							'name' => $value 
+// 					) );
+// 					$flagNature = false;
+// 					break;
+// 				}
+// 			}
+// 			if ($flagNature)
+// 				array_push ( $statisticsNature, array (
+// 						'value' => 0,
+// 						'name' => $value 
+// 				) );
+// 		}
+// 		$data ['statisticsNature'] = json_encode ( $statisticsNature );
 		
-		$statisticsNature = array ();
-		foreach ( $this->nature as $value ) {
-			$flagNature = true;
-			foreach ( $natureList as $v ) {
-				if ($value == $v ['nature']) {
-					array_push ( $statisticsNature, array (
-							'value' => $v ['count'],
-							'name' => $value 
-					) );
-					$flagNature = false;
-					break;
+		// print_r($statisticsLend);die;
+		
+		
+		
+// 		$data ['statisticsLend'] = json_encode ( $statisticsLend );
+		
+		$dateHtml = "";
+		if(empty($year)){
+			$year= date ( "Y" );
+		}
+		$now = date ( "Y" );
+		for($YEARD = 2050; $YEARD >= 2019; $YEARD --) {
+				
+			if ($YEARD <= $now) {
+				$dateHtml .= '<option ';
+				if ($year == $YEARD) {
+					$dateHtml .= 'selected ';
 				}
+				$dateHtml .= 'value="' . $YEARD . '">' . $YEARD . '</option>';
 			}
-			if ($flagNature)
-				array_push ( $statisticsNature, array (
-						'value' => 0,
-						'name' => $value 
-				) );
 		}
-		$data ['statisticsNature'] = json_encode ( $statisticsNature );
+		$data ['dateHtml'] = $dateHtml;
+		
+		
 		
-		// print_r($statisticsLend);die;
-		$data ['statisticsLend'] = json_encode ( $statisticsLend );
 		
 		$data ['status'] = $status;
 		$data ['statisticsDay'] = json_encode ( $statisticsDay );
@@ -4922,12 +4951,16 @@ class MainController extends DooController {
 		$dhtml = "";
 		$yhtml = "";
 		
-		for($year = 2020; $year >= 2004; $year --) {
-			if (date ( "Y" ) == $year)
-				$yhtml .= '<option selected value="' . $year . '">' . $year . '年</option>';
-			else
-				$yhtml .= '<option value="' . $year . '">' . $year . '年</option>';
-		}
+		require "protected/class/comm_cld.php";
+		$yhtml=GetYear();
+// 		for($year = 2020; $year >= 2004; $year --) {
+			
+// 			if (date ( "Y" ) == $year){
+// 				$yhtml .= '<option selected value="' . $year . '">' . $year . '年</option>';
+// 			}else{
+// 				$yhtml .= '<option value="' . $year . '">' . $year . '年</option>';
+// 			}
+// 		}
 		
 		for($month = 1; $month <= 12; $month ++) {
 			if (date ( "m" ) == $month)

protected/controller/ReceiptController.php

@@ -4836,6 +4836,12 @@ class ReceiptController extends DooController {
 			
 			$receiptList [$key] ['ridKey'] =$XDeode->encode( $value ['rid'] );
 			
+			if($value['version']==1){
+			
+				$receiptList[$key]['version_1_explanation']=$this->getReceiptVerson1Explanation($value);
+			
+			}
+			
 		}
 		
 		// print_r($receiptList);die;
@@ -7465,6 +7471,7 @@ class ReceiptController extends DooController {
 		// return "/implement/" . $ridKey . ".html";
 	}
 	function receiptburEdi() {
+		//include Doo::conf ()->BASE_PATH . 'diagnostic/debug.php';
 		$rid = isset ( $this->params ['rid'] ) ? $this->params ['rid'] : 0;
 		
 		$status = isset ( $this->params ['status'] ) ? $this->params ['status'] : '';
@@ -11975,6 +11982,8 @@ class ReceiptController extends DooController {
 		$data ['companyTotalHtml'] = $collectHtml;
 		$data ['total'] = $total;
 		
+		
+		
 		$data ['nature'] =$nature;
 		$data ['year'] = $year;
 		
@@ -13249,7 +13258,7 @@ class ReceiptController extends DooController {
 		
 		$sql = "" . $con;
 		$action = "paymentsAchieve";
-		$get = '/' . $expensesType; // "?date=" . urlencode ( $date ) . "&MebSea=" . urlencode ( $MebSea );
+		$get = '/' . $expensesType."?accountType=".$accountType."&expenditureType=".$expenditureType."&submitType=".$submitType; // "?date=" . urlencode ( $date ) . "&MebSea=" . urlencode ( $MebSea );
 		
 		$pageinfo = $this->get_page ( "CLD_accountBook", $sql, $page, $page_size, $action, $get, "" );
 		$limit = $pageinfo ['lower'] . ',' . $page_size;
@@ -14507,9 +14516,8 @@ class ReceiptController extends DooController {
 	
 	//获得新版报销单费用说明
 	private function getReceiptVerson1Explanation($value){
+		$version_1_explanation="";
 		if($value['version']==1){
-			
-			$version_1_explanation="";
 			if(!empty($value['officeJson'])){
 				$officeJson=json_decode($value['officeJson'],true);
 				$version_1_explanation.=$officeJson['officeExplain'][0]['officeExplain']."\n";

protected/controller/ReceiptExtendController.php

@@ -838,6 +838,9 @@ class ReceiptExtendController extends DooController {
 		$invoiceList = $invoiceTrainingDetail = array ('invoiceTotalAmount'=>0,'invoiceArriveAmount'=>0);
 		if ($receiptDetail ['invoiceTrainId'] != 0) {
 			$invoiceList = $invoice->getInvoicePrintedByItid ( $receiptDetail ['invoiceTrainId'] );
+			
+			
+			
 			$invoiceTrainingDetail = $invoiceTraining->getInvoiceTrainingByItid ( $receiptDetail ['invoiceTrainId'] );
 		}
 

protected/model/cld/receipt_cld.php

@@ -53,7 +53,7 @@ class receipt_cld extends DooModel {
 	public $_table = 'CLD_receipt';
 	public $_primarykey = 'rid';
 	public $_fields = array (
-			'aid',
+			'rid',
 			'accountItem',
 			'staff',
 			'sum',
@@ -101,6 +101,58 @@ class receipt_cld extends DooModel {
 			"version",
 	);
 
+	//费用分页
+	public function GetPage($data=array()){
+		
+		$startYear=$data['year']."-01-01:00.00.00";
+		$endYear=$data['year']."-12-31:23.59.59";
+		if(!empty($data['month'])){
+			$startYear=$data['year']."-".$data['month']."-01:00.00.00";
+			$endYear=$data['year']."-".$data['month']."-31:23.59.59";
+		}
+		$sql=" ((date>=? and date<= ?) or (pastDate>=? and pastDate<= ?) or (executeDate>=? and executeDate<= ?))  ";
+		$param=array($startYear,$endYear,$startYear,$endYear,$startYear,$endYear);
+		
+		if(!empty($data['staffId'])){
+			$sql.=" and staff=? ";
+			array_push($param, $data['staffId']);
+		}else{
+			if(!empty($data['categoryId'])){
+				$sql.=" and cid=? ";
+				array_push($param, $data['categoryId']);
+			}
+		}
+		
+		if(!empty($data['feeType'])){
+			$sql.=" and Rtype=? ";
+			array_push($param, $data['feeType']);
+		}
+		
+		if(!empty($data['kw'])){
+			$sql.=" and (receiptOrder like ? or sum like ? ) ";
+			array_push($param, "%".$data['kw']."%");
+			array_push($param, "%".$data['kw']."%");
+		}
+		
+		//获得数据
+		$list = $this->find ( array (
+					'select'=>' rid,date,pastDate,executeDate,loanDate,Rtype,receiptOrder,sum,cid,staff,receiptOrder,status,explanation,accountItem,version,officeJson,
+					    traveJson,trainJson	',
+					'where' => $sql,
+					'param' =>$param,
+					'desc' => 'rid',
+					'limit'=>$data['cPage'].','.$data['pSize'],
+					'asArray' => TRUE
+			));
+		$count=$this->count(array (
+					'where' => $sql,
+					'param' =>$param,
+					'asArray' => TRUE
+			));
+		
+		return array("count"=>$count,"list"=>$list);
+	}
+	
 	public  function Get($id){
 		$detail = $this->getOne ( array (
 				'where' => "rid= ? ",

protected/model/cld/staff_cld.php

@@ -12,20 +12,63 @@ class staff_cld extends DooModel {
 				'asArray' => TRUE 
 		) );
 		
+// 		Doo::loadClass ( 'XDeode' );
+// 		$XDeode = new XDeode ( 9 );
+		
+// 		$detail ['sid_cld']=$XDeode->encode($detail ['sid']);
+// 		$detail ['cid']=$XDeode->encode($detail ['cid']);
+		
+// 		//
+// 		$detail ['cldAccessArray'] = array ();
+// 		if (! empty ( $detail ['cldAccess'] )) {
+// 			$detail ['cldAccessArray'] = json_decode ( $detail ['cldAccess'] );
+// 		}
+		
+		$detail=$this->makeStaffView($detail);
+		
+		return $detail;
+	}
+	
+	
+	
+	//办事处ID获得员工
+	public function GetCategoryId($categoryId=0){
+		$condition=array('where' => "username!='admin' and nature !=4 and (pendStatus!=3 or pendStatus!=4) ",'asArray' => TRUE);
+		if($categoryId!=0){
+			$condition=array (
+					'where' => "cid= ? and username!='admin' and nature !=4 and (pendStatus!=3 or pendStatus!=4) ",
+					'param' => array (
+							$categoryId
+					),
+					'asArray' => TRUE
+			);
+		}
+		
+		$list = $this->find ( $condition );
+		
+		foreach ($list as $key=>$value){
+			$list[$key]=$this->makeStaffView($value);
+		}
+		
+		return $list;
+	}
+	
+	private function makeStaffView($data=array()){
+		
 		Doo::loadClass ( 'XDeode' );
 		$XDeode = new XDeode ( 9 );
 		
-		$detail ['sid_cld']=$XDeode->encode($detail ['sid']);
-		$detail ['cid']=$XDeode->encode($detail ['cid']);
+		$data ['sid_cld']=$XDeode->encode($data ['sid']);
+		$data ['cid']=$XDeode->encode($data ['cid']);
 		
-		//
-		$detail ['cldAccessArray'] = array ();
-		if (! empty ( $detail ['cldAccess'] )) {
-			$detail ['cldAccessArray'] = json_decode ( $detail ['cldAccess'] );
+		$data ['cldAccessArray'] = array ();
+		if (! empty ( $data ['cldAccess'] )) {
+			$data ['cldAccessArray'] = json_decode ( $data ['cldAccess'] );
 		}
 		
-		return $detail;
+		return $data;
 	}
+	
 	private $sid;
 	private $username;
 	private $passwork;

protected/model/cld/verify_cld.php

@@ -46,6 +46,44 @@ class verify_cld extends DooModel {
 		return $veList;
 	}
 	
+	function getVerifyBySubordinate($subordinate='',$subordinate2=''){
+		if (empty($subordinate)){
+			return array();
+		}
+		$con='subordinate like "%'.$subordinate.'%"';
+		if (!empty($subordinate2)){
+			$con='subordinate like "%'.$subordinate.'%" or subordinate like "%'.$subordinate2.'%"';
+		}
+		$veList = $this->find ( array (
+				'where'=>$con,
+				'asArray' => true
+		) );
+		Doo::loadModel ( "role" );
+		$role = new role ();
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 9 );
+		foreach ( $veList as $key => $value ) {
+			
+			$veList[$key] ['vid']=$XDeode->encode($value ['vid']);
+			
+			$v = json_decode ( $value ['staff'] );
+			$list = array ();
+			foreach ( $v as $n => $m ) {
+				if ($m ['1'] == 'ROLE') {
+					$roleInfo = $role->getOne ( array (
+							'where' => 'rid=' . $m [0],
+							'asArray' => true
+					) );
+					$v [$n] [1] = $roleInfo ['name'];
+					array_push ( $list, $roleInfo ['name'] );
+				} else {
+					array_push ( $list, $v [$n] [1] );
+				}
+			}
+			$veList [$key] ['staff'] = implode ( '>', $list );
+		}
+		return $veList;
+	}
 }
 
 ?>

protected/model/invoice.php

@@ -640,10 +640,12 @@ class invoice extends DooModel {
 	//入账-公司已收款金额汇总
 	function _SumRecelvables($itidSql,$receivablesBank=''){
 		//1.获得发票完成列表
-		$sql = 'select irid,invoicePrice
+		$sql = 'select irid,invoicePrice,untreadStatus
  				from ' . $this->_table . '
  				where trainId= ? and status=2 and printStatus=1 and  untreadStatus=3 and irid!=""
  				';
+// 		echo $sql;
+// 		echo $itidSql;
 		$query = Doo::db ()->query ( $sql,array($itidSql) );
 		$resultInvoice = $query->fetchAll ();
 		//收集收款金额
@@ -664,18 +666,27 @@ class invoice extends DooModel {
 		$query = Doo::db ()->query ( $sql );
 		$result = $query->fetchAll ();
 		//合计金额-收款不会大于发票金额，大于则重置为发票总金额
+// 		print_r($resultInvoice);
 		$sum=0;
 		foreach ($resultInvoice as $value){
-			foreach ($result as $k=>$v){
-				if($value['irid']==$v['irid']){
-					if ($value['invoicePrice']<$v['receivablesPrice']){
-						$sum+=$value['invoicePrice'];
-					}else{
-						$sum+=$result[$k]['receivablesPrice'];
+			
+			if($value['untreadStatus']==3){
+				$sum+=$value['invoicePrice'];
+			}else{
+				foreach ($result as $k=>$v){
+				
+					if($value['irid']==$v['irid']){
+						if ($value['invoicePrice']<$v['receivablesPrice']){
+							$sum+=$value['invoicePrice'];
+						}else{
+							$sum+=$result[$k]['receivablesPrice'];
+						}
+						break;
 					}
-					break;
 				}
 			}
+			
+			
 		}
 		
 		return array('receivablesPrice'=>$sum,'trainId'=>$itidSql);
@@ -1340,11 +1351,24 @@ class invoice extends DooModel {
 			
 			$lossDate= date('m',strtotime ( $list [$key] ['OperationLog'] ['date'] ));
 			$printMonth=date('m',strtotime ( $value['printTime']));
+			
+			$lossDateYear= date('Y',strtotime ( $list [$key] ['OperationLog'] ['date'] ));
+			$printYear=date('Y',strtotime ( $value['printTime']));
+			
 			$list [$key] ['lossShow'] = false;
-			if($printMonth<$lossDate){
-				$list [$key] ['lossShow'] = true;
+			if ($lossDateYear!=$printYear){
+				if ($printYear<$lossDateYear){
+					$list [$key] ['lossShow'] = true;
+				}
+			}else{
+				if($printMonth<$lossDate){
+					$list [$key] ['lossShow'] = true;
+				}
 			}
 			
+			
+			
+			
 				
 		}
 		

protected/model/invoiceStore.php

@@ -262,6 +262,20 @@ class invoiceStore extends DooModel {
 			'invoiceForm',
 	);
 	
+	function bbc($itid = 0,$con=''){
+		Doo::loadClass('XDeode');
+		$XDeode = new XDeode (5);
+		$itid = $XDeode->decode($itid);
+		Doo::loadModel('invoice');
+		$invoice = new invoice ();
+		
+// 		1.获得仓库中的发票
+		$sql="select * from ". $this->_table ." as a where ".$con . "  a.trainId=" . $itid ." and ( b.isDelete is null or b.isDelete=0 )  order by a.isid desc";
+		$query =Doo::db()->query($sql);
+		$list = $query->fetchAll();
+		
+	}
+	
 	/**
 	 * 根据培训班ID获得发票数据
 	 * @param number $itid
@@ -285,7 +299,7 @@ class invoiceStore extends DooModel {
 
             $sql = "select " . $field . " from " . $this->_table . " as a left join CLD_invoice as b on (a.iid=b.iid  )  
 			where " . $con . "  a.trainId=" . $itid . ' and (b.invoiceForm='.$invoiceForm.' or b.invoiceForm is null)  and ( b.isDelete is null or b.isDelete=0 )  order by a.isid desc ';
-            //echo $sql;
+//             echo $sql;
 
 
             $query = Doo::db()->query($sql);
@@ -325,14 +339,22 @@ class invoiceStore extends DooModel {
         $iidList=array_filter ($iidList);
         $iidString = implode(',', $iidList);
 
-        if (!empty($iidString)) {
-        	
-        	$invoice = new invoice ();
-        	$ilist = $invoice->find(array(
-            'where' => "trainId = " . $itid . " and invoiceForm=".$invoiceForm."  and (status=1 or status=2) and untreadStatus!=2 and ( isDelete is null or isDelete=0 ) and iid not in (" . $iidString . ")",
-            'asArray' => TRUE
-        ));
-
+       
+//         仓库中没有发票，有可能直接提交了发票
+        if (! empty ( $iidString )) {
+			
+			$invoice = new invoice ();
+			$ilist = $invoice->find ( array (
+					'where' => "trainId = " . $itid . " and invoiceForm=" . $invoiceForm . "  and (status=1 or status=2) and untreadStatus!=2 and ( isDelete is null or isDelete=0 ) and iid not in (" . $iidString . ")",
+					'asArray' => TRUE 
+			) );
+		} else {
+// 			$invoice = new invoice ();
+// 			$ilist = $invoice->find ( array (
+// 					'where' => "trainId = " . $itid . " and invoiceForm=" . $invoiceForm . "  and (status=1 or status=2) and untreadStatus!=2 and ( isDelete is null or isDelete=0 ) ",
+// 					'asArray' => TRUE
+// 			) );
+		}
         if (!empty($ilist)) {
             foreach ($ilist as $key => $value) {
                 $value['apStatus'] = 1;
@@ -350,7 +372,7 @@ class invoiceStore extends DooModel {
                 $this->setInvoiceStoreByCondition ( $itemIS );
             }
         }
-        }
+        
 		//print_r($ilist);
 
 		Doo::loadModel ( 'invoiceReceivables' );

protected/model/invoiceTraining.php

@@ -154,6 +154,8 @@ class invoiceTraining extends DooModel {
 		}
 		return $list;
 	}
+	
+	
 	function getInvoiceTrainingByTodo($select = "", $cid = 0, $sid = 0) {
 		Doo::loadModel ( 'staff' );
 		$staff = new staff ();
@@ -355,6 +357,22 @@ class invoiceTraining extends DooModel {
 		return $list;
 	}
 	
+// 	function Get($itid = 0){
+// 		Doo::loadClass ( 'XDeode' );
+// 		$XDeode = new XDeode ( 5 );
+// 		if (! is_numeric ( $itid )){
+// 			$itid = $XDeode->decode ( $itid );
+// 		}
+// 		$detail = array ();
+// 		if (! empty ( $itid ) && is_numeric ( $itid )) {
+// 			$detail = $this->getOne ( array (
+// 					'where' => " itid=" . $itid,
+// 					'asArray' => TRUE
+// 			) );
+// 		}
+// 		return $detail;
+// 	}
+	
 	/**
 	 * 根据ID获得培训班
 	 * @param number $itid
@@ -455,13 +473,13 @@ class invoiceTraining extends DooModel {
 				}
 			}
 			//公司已收款
-			$detail ['invoiceCompanyAmount']=0;
-			foreach ($companyList as $key=>$value){
-				if ($detail ['itid'] == $value ['trainId']) {
-					$detail ['invoiceCompanyAmount'] = $value ['receivablesPrice'];
-					break;
-				}
-			}
+			$detail ['invoiceCompanyAmount']=$detail ['invoiceArriveAmount']-$detail ['RIAmount'];
+// 			foreach ($companyList as $key=>$value){
+// 				if ($detail ['itid'] == $value ['trainId']) {
+// 					$detail ['invoiceCompanyAmount'] = $value ['receivablesPrice'];
+// 					break;
+// 				}
+// 			}
 			
 			$detail ['invoiceCompanyAmountM']=sprintf ( "%.2f", $detail ['invoiceCompanyAmount'] );
 			$detail ['invoiceArriveAmountM']=sprintf ( "%.2f", $detail ['invoiceArriveAmount'] );

protected/model/receipt.php

@@ -555,10 +555,18 @@ class receipt extends DooModel {
 			if ($list [$key] ['Rtype'] == 0) {
 				$accountType = 3;
 			} elseif ($list [$key] ['Rtype'] == 1) {
-				if (! empty ( $list [$key] ['accountItem'] ))
+				
+				if($list [$key]['version']==1){
 					$accountType = 2;
-				else
-					$accountType = 1;
+				}else{
+					if (! empty ( $list [$key] ['accountItem'] )){
+						$accountType = 2;
+					}else{
+						$accountType = 1;
+					}		
+				}
+				
+				
 			} elseif ($list [$key] ['Rtype'] == 2) {
 				$accountType = 4;
 			} elseif ($list [$key] ['Rtype'] == 3) {

protected/services/fee_service.php

@@ -5,6 +5,7 @@ class fee_service {
 	private $receipt;
 	private $XDeode;
 	private $category;
+	private $staff;
 	function __construct() {
 		Doo::loadModel ( 'cld/account_item_cld' );
 		$this->accountItem = new account_item_cld ();
@@ -19,6 +20,8 @@ class fee_service {
 		$this->category = new category_cld ();
 		Doo::loadModel ( 'cld/traveDate_cld' );
 		$this->traveDate_cld = new traveDate_cld ();
+		Doo::loadModel ( 'cld/staff_cld' );
+		$this->staff = new staff_cld ();
 	}
 	
 	// 费用 报销单-创建-参数校验
@@ -102,8 +105,8 @@ class fee_service {
 	}
 	
 	// 审批组
-	public function GetVerify() {
-		$list = $this->verify->GetAll ();
+	public function GetVerifyType($subordinate="",$subordinate2="") {
+		$list = $this->verify->getVerifyBySubordinate($subordinate,$subordinate2);
 		return $list;
 	}
 	
@@ -259,7 +262,10 @@ class fee_service {
 		}
 		
 		$receipt->cid = $data ['officeId'];
-		$receipt->verify = $data ['verifyId'];
+		if($data ['status']!=4){
+			$receipt->verify = $data ['verifyId'];
+		}
+		
 		$receipt->sum = $total;
 		
 		Doo::loadModel ( 'execute' );
@@ -357,6 +363,122 @@ class fee_service {
 		return $data;
 	}
 	
+	//费用分页
+	public function GetFeePage($data=array()){
+		if (!empty($data['categoryId'])){
+			$data['categoryId']=$this->XDeode->decode($data['categoryId']);
+		}
+		if (!empty($data['staffId'])){
+			$data['staffId']=$this->XDeode->decode($data['staffId']);
+		}
+		if(empty($data['year'])){
+			$data['year']=date ( "Y" );
+		}
+		if(!is_numeric($data['pSize'])){
+			$data['pSize']=20;
+		}
+		if(!is_numeric($data['cPage'])){
+			$data['cPage']=0;
+		}else{
+			$data['cPage']=( $data['cPage']-1) * $data['pSize'];
+		}
+		
+		$data=$this->receipt->GetPage($data);
+		//获得办事处信息
+		$office=$this->category->GetAll();
+		//获得员工信息
+		$staffList=$this->staff->find(array('asArray' => TRUE));
+		
+		foreach ($data['list'] as $key=>$value){
+			$data['list'][$key]['ridOld']=$value['rid'];
+			$data['list'][$key]['rid']=$this->XDeode->encode($value['rid']);
+			$data['list'][$key]['cid']=$this->XDeode->encode($value['cid']);
+			$data['list'][$key]['staff']=$this->XDeode->encode($value['staff']);
+			$data['list'][$key]['categoryValue']="";
+			$data['list'][$key]['statusValue']=$this->feeStatusValue[$value['status']];
+			foreach ($office as $k=>$v){
+				if($v['cid']==$data['list'][$key]['cid']){
+					$data['list'][$key]['categoryValue']=$v['title'];
+				}
+			}
+			$data['list'][$key]['staffName']="";
+			foreach ($staffList as $k=>$v){
+				if($v['sid']==$value['staff']){
+					$data['list'][$key]['staffName']=$v['username'];
+				}
+			}
+			$data['list'][$key]['Rtype']=$this->feeTypeValue[$value['Rtype']];
+			if($this->getFeeLoanType($value)){
+				$data['list'][$key]['Rtype'].="报销单";
+			}
+			
+			if($value['pastDate']=="0000-00-00"){
+				$data['list'][$key]['pastDate']="";
+			}
+			
+			if($value['version']==1){
+				$data['list'][$key]['explanation']=$this->getReceiptVerson1Explanation($value);
+			}
+		}
+		
+		return $data;
+	}
+	
+	private $feeTypeValue=array(
+			0=>"报销单",
+			1=>"借款",
+			2=>"对公汇款",
+			3=>"培训班费用",
+	);
+		
+	private $feeStatusValue=array(
+			1=>"待执行",
+			2=>"审批中",
+			3=>"终止",
+			4=>"撤回",
+			5=>"待提交",
+			6=>"待执行",
+			7=>"待提交",
+			8=>"执行完成",
+			9=>"执行完成",
+			10=>"已锁定",
+	);
+	
+	//获得借款-报销单类型 0借款 1借款报销单
+	private function getFeeLoanType($value){
+		$type=0;
+		if($value['Rtype']==1){
+			if($value['version']==1){
+				$type=1;
+			}else{
+				if(!empty($value['accountItem'])){
+					$type=1;
+				}
+			}
+		}
+		return $type;
+	}
+	
+	//获得新版报销单费用说明
+	private function getReceiptVerson1Explanation($value){
+		$version_1_explanation="";
+		if($value['version']==1){
+			if(!empty($value['officeJson'])){
+				$officeJson=json_decode($value['officeJson'],true);
+				$version_1_explanation.=$officeJson['officeExplain'][0]['officeExplain']."\n";
+			}
+			if(!empty($value['traveJson'])){
+				$traveJson=json_decode($value['traveJson'],true);
+				$version_1_explanation.=$traveJson['traveExplain'][0]['traveExplain']."\n";
+			}
+			if(!empty($value['trainJson'])){
+				$trainJson=json_decode($value['trainJson'],true);
+				$version_1_explanation.=$trainJson['trainExplain'][0]['trainExplain']."\n";
+			}
+		}
+		return $version_1_explanation;
+	}
+	
 	// 获得审批流程
 	private function makeVerifyProcess($verifyId, $verifyStaff) {
 		// 检测编辑状态

protected/services/office_service.php

@@ -12,6 +12,12 @@ class office_service {
 		
 		return $list;
 	}
+	
+	public function Get(){
+		$list = $this->category->GetAll ();
+		
+		return $list;
+	}
 }
 
 ?>

protected/view/admin/expenses.html

@@ -109,7 +109,11 @@
 							
 							<td>{{receiptList' value.category}}</td>
 							<td>{{receiptList' value.receiptOrder}}<p class="colGray">{{receiptList' value.date}}</p></td>
-							<td>{{receiptList' value.explanation}}</td>
+							<td><!-- if {{receiptList' value.version}}==1 -->
+							<pre>{{receiptList' value.version_1_explanation}}</pre>
+							<!-- else -->
+							{{receiptList' value.explanation}}
+							<!-- endif --></td>
 							<td>
 							<!-- if {{receiptList' value.status}}==1 -->
 								执行中

protected/view/admin/invoice.html

@@ -211,7 +211,7 @@
 							
 							
 							<div class="clearfix">
-							<legend><div class="fR"><a href="/invoiceAchieve">查看更多</a></div>最近入账</legend>
+							<legend><div class="fR"><a href="/invoiceAchieve">查看更多</a></div>最近入账完成</legend>
 							<!-- if !empty({{receivablesList}}) -->
 							<table class="table table-bordered table-condensed">
 								<tbody>

protected/view/admin/invoiceTrainingDetail.html

@@ -113,6 +113,11 @@ $("input[enclosurFile]").change(function() {
 						</li>
 	  			</ul>
 	  			</form>
+	  			<!-- else -->
+	  			<ul class="cateList">
+	  			<a href="/invoiceTrainingDetail/{{itid}}.html" class="now" data-toggle="modal">纸质发票</a>
+						<a href="/invoiceTrainingElectronicDetail/{{itid}}.html" data-toggle="modal">电子发票</a>
+	  			</ul>
 	  			<!-- endif -->
 	  		</div>
 				<div class="saeaList">

protected/view/admin/receipt_menu.html

@@ -38,12 +38,13 @@
 
 	
 	<!-- if isPaymentsShow({{staff.0.sid}}) -->	
-	<li><a href="/paymentsCollect" <!-- if {{receiptMemu}}=="paymentsCollect" --> class="selected" <!-- endif --> >日常收支汇总</a></li>
+	<li><a href="/view/income/collect" <!-- if {{receiptMemu}}=="paymentsCollect" --> class="selected" <!-- endif --> >日常收支汇总</a></li>
 	<li><a href="/wasteBook" <!-- if {{receiptMemu}}=="wasteBook" --> class="selected" <!-- endif --> >公司流水</a></li>
 	<li><a href="/wasteBookReport" <!-- if {{receiptMemu}}=="wasteBookReport" --> class="selected" <!-- endif --> >流水报表</a></li>
+		<li><a href="/view/fee" <!-- if {{receiptMemu}}=="feeList" --> class="selected" <!-- endif --> >所有费用列表</a></li>
 	<!-- endif -->
 	
-	
+
 	
 	<li <!-- if  isGHNews($_COOKIE ['staffGH'])!=0 --> class="news" <!-- endif --> >
 	<a ghToken  href="javascript:void(0)" data-toggle="modal">工会</a>

protected/view/admin/year.html

@@ -4,4 +4,5 @@
 <option <!-- if {{year}}==2017 --> selected <!-- endif --> value="2017">2017</option>
 <option <!-- if {{year}}==2018 --> selected <!-- endif --> value="2018">2018</option>
 <option <!-- if {{year}}==2019 --> selected <!-- endif --> value="2019">2019</option>
-<option <!-- if {{year}}==2020 --> selected <!-- endif --> value="2020">2020</option>
+<option <!-- if {{year}}==2020 --> selected <!-- endif --> value="2020">2020</option>
+<option <!-- if {{year}}==2021 --> selected <!-- endif --> value="2021">2021</option>

protected/view/expenses/payments.html

@@ -44,7 +44,10 @@
 								</div>
 								
 								<div class="clearfix">
-									<legend><div class="fR"><a href="/paymentsAchieve">所有收支</a></div>最近收支</legend>
+									<legend><div class="fR">
+									<a href="/paymentsAchieve">所有收支</a>
+									<a href="/view/income/expenses">所有收支2</a>
+									</div>最近收支</legend>
 									<table class="table table-bordered table-condensed">
 										<tbody>
 										<tr><th class="taC" width="50"></th><th class="taC" width="140">费用类别</th><th class="taC">单号</th><th class="taC">金额</th><th class="taC">到款/支付银行</th><th class="taC">银行到款/支付时间</th><th class="taC">录入时间</th></tr>

protected/view/fee/create/receipt.html

@@ -192,8 +192,8 @@
 											<tr>
 												<td colspan="2"><input type="file" @change="enclosurFile($event)"
 														accept="image/png,image/gif,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document
-													,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel">
-													&nbsp;&nbsp;<span>支持jpg、png、doc、docx、els、elsx；最大8M文件。</span>
+													,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,application/pdf">
+													&nbsp;&nbsp;<span>支持jpg、png、doc、docx、els、elsx、pdf；最大8M文件。</span>
 													<!--已上传文件-->
 													<table class="table">
 														<thead>
@@ -222,19 +222,39 @@
 													<!--已上传文件-->
 												</td>
 											</tr>
+											<!-- if isset({{status}}) -->
+												
+												<tr <!-- if {{status}}==4 --> style="display:none" <!-- endif -->>
+													<th colspan="2" class="taC">报销单审批</th>
+												</tr>
+												
+												<tr <!-- if {{status}}==4 --> style="display:none" <!-- endif --> >
+													<th id="shenpi">选择审批组</th>
+													<td class="taR">
+														<select  name="verifyId" v-model="verifyId">
+															<option value="">请选择审批组</option>
+															<option v-for="item in verify" v-bind:value="item.vid">
+																{{ item.description }}({{ item.staff }})</option>
+														</select>
+													</td>
+												</tr>
+												
+											<!-- else -->
 											<tr>
-												<th colspan="2" class="taC">报销单审批</th>
-											</tr>
-											<tr>
-												<th id="shenpi">选择审批组</th>
-												<td class="taR">
-													<select name="verifyId" v-model="verifyId">
-														<option value="">请选择审批组</option>
-														<option v-for="item in verify" v-bind:value="item.vid">
-															{{ item.description }}({{ item.staff }})</option>
-													</select>
-												</td>
-											</tr>
+													<th colspan="2" class="taC">报销单审批</th>
+												</tr>
+												
+												<tr >
+													<th id="shenpi">选择审批组</th>
+													<td class="taR">
+														<select name="verifyId" v-model="verifyId">
+															<option value="">请选择审批组</option>
+															<option v-for="item in verify" v-bind:value="item.vid">
+																{{ item.description }}({{ item.staff }})</option>
+														</select>
+													</td>
+												</tr>
+											<!-- endif -->
 											<tr>
 												<th colspan="2" class="taC">产生费用所在办事处</th>
 											</tr>

protected/view/fee/detail/receiptPrint_compatible.html

@@ -45,8 +45,7 @@
 	  						<tr class="warning"><td ><b>办事处相关费用合计</b></td>
 	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.officeTotal}}</b></td></tr>
 	  						
-		  						<tr><th class="taC" colspan="2">报销说明</th></tr>
-		  						<tr><td colspan="2">{{receiptDetail' value.officeExplain}}</td></tr>
+		  						
 		  						<tr><th colspan="2" class="taC">日常相关费用</th></tr>
 		  						<!-- loop receiptDetail' value.officeJson.daily -->
 		  							<!-- if {{item' value' value.price}}!=0 -->
@@ -75,12 +74,10 @@
 	  						<tr class="warning"><td ><b>差旅相关费用合计</b></td>
 	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.traveTotal}}</b></td></tr>
 	  						
-	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
-		  						<tr><td colspan="2">{{receiptDetail' value.traveExplain}}</td></tr>
-		  						<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+	  						
+		  						<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
 		  						<!-- loop receiptDetail' value.traveJson.traveList -->
-		  							<tr><th colspan="2" class="taL">行程{{item' value' value.index}}# {{item' value' value.tripTime}}<br>
-		  							<i class="contactsMark icon-">P</i> {{item' value' value.detailCity}}</th></tr>
+		  							
 		  							<!-- 行程单简要详情 -->
 		  							<!-- loop item' value' value.detailTrip -->
 			  							<!-- if {{item' value' value' value}}!=0 -->
@@ -92,7 +89,7 @@
 		  							<!-- endloop -->
 		  							<tr><th class="taR">合计</th><td class="colGreen taR">￥{{item' value' value.tripTotal}}</td></tr>
 		  							<!-- 行程单详细内容 -->
-										<tr>
+										<tr style="display: none">
 											<td colspan="2">
 												<a href="#" class="close-detail" style="display: none">- 收起详细行程单</a><a href="#" class="open-detail">+ 展开详细行程单</a>
 												<table class="table table-bordered table-condensed table-hover mb-0" style="display: none">
@@ -141,8 +138,7 @@
 	  						<tr class="warning"><td ><b>内部培训费用合计</b></td>
 	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.trainTotal}}</b></td></tr>
 	  						
-	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
-		  						<tr><td colspan="2">{{receiptDetail' value.trainExplain}}</td></tr>
+	  						
 		  						<tr><th colspan="2" class="taC">内部培训费用</th></tr>
 		  						<!-- loop receiptDetail' value.trainJson.train -->
 		  							<!-- if {{item' value' value.price}}!=0 -->
@@ -258,7 +254,18 @@
 		  							<div class="avtra"><img src="{{receiptDetail' value' value.img}}_2.jpg" width="32"></div>
 		  							<div class="comment">
 		  								<p <!-- if {{receiptDetail' value' value.status}}!=2 --> class="colGray" <!-- endif --> ><span class="fR">{{receiptDetail' value' value.date}}</span>{{receiptDetail' value' value.username}} <!-- if {{receiptDetail' value' value.rolename}}!='' --> （{{receiptDetail' value' value.rolename}}） <!-- endif --></p>
-		  								<p>提交审批</p>
+		  								<p>
+		  								<!-- if {{receiptDetail' value' value.status}}==4 --> 
+		  								撤回
+		  								<!-- else -->
+		  								
+		  								 <!-- if {{receiptDetail' value' value.status}}==1 -->
+											  同意支付
+											  <!-- else -->
+											  {{receiptDetail' value' value.opinion}}
+											  <!-- endif -->
+										<!-- endif -->	  
+											  </p>
 		  							</div>
 		  						</li>
 		  						<!-- endloop -->

protected/view/fee/detail/receipt_compatible.html

@@ -121,7 +121,7 @@
 	  						
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 		  						<tr><td colspan="2">{{receiptDetail' value.traveExplain}}</td></tr>
-		  						<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+		  						<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
 		  						<!-- loop receiptDetail' value.traveJson.traveList -->
 		  							<tr><th colspan="2" class="taL">行程{{item' value' value.index}}# {{item' value' value.tripTime}}<br>
 		  							<i class="contactsMark icon-">P</i> {{item' value' value.detailCity}}</th></tr>
@@ -241,8 +241,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>
@@ -296,9 +295,9 @@
 	  					<div class="censorList">
 	  					<ul>
 		  						<li class="post">
-		  							<div class="avtra"><img src="{{staff.0.avatar}}_2.jpg" width="32"></div>
+		  							<div class="avtra"><img src="{{receiptList' value.staffDetail.avatar}}_2.jpg" width="32"></div>
 		  							<div class="comment">
-		  								<p><span class="fR">{{receiptDetail' value.date}}</span>{{staff.0.username}}</p>
+		  								<p><span class="fR">{{receiptDetail' value.date}}</span>{{receiptList' value.staffDetail.username}}</p>
 		  								<p>提交审批</p>
 		  							</div>
 		  							

protected/view/fee/implement/loan_compatible.html

@@ -202,7 +202,7 @@ $(function(){
 	  						
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 		  						<tr><td colspan="2">{{receiptDetail' value.traveExplain}}</td></tr>
-		  						<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+		  						<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
 		  						<!-- loop receiptDetail' value.traveJson.traveList -->
 		  							<tr><th colspan="2" class="taL">行程{{item' value' value.index}}# {{item' value' value.tripTime}}<br>
 		  							<i class="contactsMark icon-">P</i> {{item' value' value.detailCity}}</th></tr>

protected/view/fee/implement/receipt_compatible.html

@@ -121,7 +121,7 @@ $(function(){
 	  						
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 		  						<tr><td colspan="2">{{receiptDetail' value.traveExplain}}</td></tr>
-		  						<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+		  						<tr><th colspan="2" class="taC">差旅相关费用</th></tr>
 		  						<!-- loop receiptDetail' value.traveJson.traveList -->
 		  							<tr><th colspan="2" class="taL">行程{{item' value' value.index}}# {{item' value' value.tripTime}}<br>
 		  							<i class="contactsMark icon-">P</i> {{item' value' value.detailCity}}</th></tr>

protected/view/fee/menu.html

@@ -38,12 +38,14 @@
 
 	
 	<!-- if isPaymentsShow({{staff.sid}}) -->	
-	<li><a href="/paymentsCollect" <!-- if {{receiptMemu}}=="paymentsCollect" --> class="selected" <!-- endif --> >日常收支汇总</a></li>
+	<!-- /paymentsCollect -->
+	<li><a href="/view/income/collect" <!-- if {{receiptMemu}}=="paymentsCollect" --> class="selected" <!-- endif --> >日常收支汇总</a></li>
 	<li><a href="/wasteBook" <!-- if {{receiptMemu}}=="wasteBook" --> class="selected" <!-- endif --> >公司流水</a></li>
 	<li><a href="/wasteBookReport" <!-- if {{receiptMemu}}=="wasteBookReport" --> class="selected" <!-- endif --> >流水报表</a></li>
+	<li><a href="/view/fee" <!-- if {{receiptMemu}}=="feeList" --> class="selected" <!-- endif --> >所有费用列表</a></li>
 	<!-- endif -->
 	
-	
+		
 	
 	<li <!-- if  isGHNews($_COOKIE ['staffGH'])!=0 --> class="news" <!-- endif --> >
 	<a ghToken  href="javascript:void(0)" data-toggle="modal">工会</a>

protected/view/fee/test.html

@@ -1,77 +0,0 @@
-<!--
- * @description: 
- * @Author: CP
- * @Date: 2020-11-16 15:18:12
- * @FilePath: \cld\protected\view\fee\test.html
--->
-<div class="seTable">
-    <table class="table table-bordered table-condensed table-hover mb-0">
-        <tbody>
-            <tr>
-                <th colspan="2" class="taC" id="neibupeixun">内部培训费用</th>
-            </tr>
-            <tr>
-                <th>场租费</th>
-                <td width="200" class="taR">￥<input type="number" value="0" placeholder="输入场租费" pattern="[0-9]" step="1"
-                        min="0" class="span2"></td>
-            </tr>
-            <tr>
-                <th>薪酬</th>
-                <td width="200" class="taR">￥<input type="number" value="0" placeholder="输入薪酬" pattern="[0-9]" step="1"
-                        min="0" class="span2"></td>
-            </tr>
-            <tr>
-                <th>住宿费</th>
-                <td width="200" class="taR">￥<input type="number" value="0" placeholder="输入住宿费" pattern="[0-9]" step="1"
-                        min="0" class="span2"></td>
-            </tr>
-            <tr>
-                <th>交通费</th>
-                <td width="200" class="taR">￥<input type="number" value="0" placeholder="输入交通费" pattern="[0-9]" step="1"
-                        min="0" class="span2"></td>
-            </tr>
-            <tr>
-                <th>餐饮费</th>
-                <td width="200" class="taR">￥<input type="number" value="0" placeholder="输入餐饮费" pattern="[0-9]" step="1"
-                        min="0" class="span2"></td>
-            </tr>
-            <tr>
-                <th>办公费</th>
-                <td width="200" class="taR">￥<input type="number" value="0" placeholder="输入办公费" pattern="[0-9]" step="1"
-                        min="0" class="span2"></td>
-            </tr>
-            <tr>
-                <th>餐费补助</th>
-                <td width="200" class="taR">￥<input type="number" value="0" placeholder="输入公关费" pattern="[0-9]" step="1"
-                        min="0" class="span2"></td>
-            </tr>
-            <tr>
-                <th>其他</th>
-                <td width="200" class="taR">￥<input type="number" value="0" placeholder="输入其他" pattern="[0-9]" step="1"
-                        min="0" class="span2"></td>
-            </tr>
-            <tr>
-                <th class="taR">合计</th>
-                <td class="colGreen taR">￥0.00</td>
-            </tr>
-            <tr class="warning">
-                <td class="taR"><b>内部培训费用合计</b></td>
-                <td class="colGreed taR"><b style="font-size: 24px">￥2160.00</b>
-                </td>
-            </tr>
-            <tr>
-                <th colspan="2" class="taC">报销说明</th>
-            </tr>
-            <tr>
-                <th colspan="2"><textarea required rows="6" style="width: 99%" placeholder="内部培训费用说明"></textarea></th>
-            </tr>
-        </tbody>
-    </table>
-</div>
-<div class="seCensor receipt-censor">
-    <div class="title">报销单填写说明</div>
-    <div class="detail">
-        <p>1 此项费用，仅用于纵横内部培训；</p>
-        <p>2 用于客户的培训费用，请创建“培训班结算”。</p>
-    </div>
-</div>

protected/view/indexLongle.html

@@ -1,6 +1,9 @@
 <!-- include 'header' -->
 
 <script src="<?= WEB_SITE_GLOBAL ?>js/echarts.min.js"></script>
+<link href="<?= WEB_SITE_GLOBAL ?>gridManager/common.css" rel="stylesheet" type="text/css">
+<link href="<?= WEB_SITE_GLOBAL ?>gridManager/gm.css" rel="stylesheet" type="text/css">
+<script src="<?= WEB_SITE_GLOBAL ?>gridManager/gm.js"></script>
 
 	
 <body>
@@ -120,39 +123,21 @@
 			        <div id="chartContainer1" style="height: 300px; width: 100%;">
 			        </div>
 			        <!--图表1-->
-			        <div class="clearfix">
 			        
 			        
-			        <form action="/longleStatistics" id="LST" method="post">
+					<div style="text-align:center" >
+						<select class="search-action">
+							{{dateHtml}}
+						</select>
+					</div>
+					<section class="grid-main">
+						<table id="feeList"></table>
+					</section>
+					
+			        
+			        
 			        
-			        <div style="text-align:center">
-			        <!-- if !empty({{sid}}) -->
-			        	<select name="district" onchange="longleDi()">
-			        		<!-- loop districtHtml -->
-			        		<option <!-- if {{districtHtml' value.id}}=={{districtH}} --> selected <!-- endif --> value="{{districtHtml' value.id}}">{{districtHtml' value.name}}</option>
-			        		<!-- endloop -->
-			        		
-			        	</select>
-			        	 & 
-			        	 <input type="hidden" name="sid" value="{{sid}}">
-			        <!-- endif -->
-				        <select  name="status" onchange="longleSt()">
-					        <option <!-- if {{status}}==4 --> selected <!-- endif --> value="4">借出</option>
-					        <option <!-- if {{status}}==5 --> selected <!-- endif --> value="5">销售</option>
-					        <option <!-- if {{status}}==6 --> selected <!-- endif --> value="6">赠送</option>
-				        </select>
-			        </div>
-			        <!--图表2-->
-			        <div class="fL" id="chartContainer2" style="height: 300px; width: 50%;">
-			        </div>
-			        <!--图表2-->
-			        <!--图表3-->
-			        <div  class="fR"  id="chartContainer3" style="height: 300px; width: 50%;">
-			        </div>
-			        <!--图表3-->
-			        </form>
 			        
-			        </div>
 			        </div>
 				  		</div>
 	  				</div>
@@ -160,8 +145,10 @@
 	  		</div>
 		</div>
 	</div>
-	
-	
+	<script type="text/javascript">
+	var sid={{sid}};
+	</script>
+<script src="<?= WEB_SITE_GLOBAL ?>gridManager/dashboard/longle.js"></script>
 <script type="text/javascript">autoFlashHeight();</script>
 <script type="text/javascript">
 //         // 路径配置
@@ -264,10 +251,15 @@
                     
                 // 为echarts对象加载数据 
                 myChart.setOption(option); 
+                
+                
+                
+                
+                
                 //1 最近30天客户数量与记录趋势//
                 //2 最近30天客户数量地域//
                 // 基于准备好的dom，初始化echarts图表
-                 var myChart = echarts.init(document.getElementById('chartContainer2'));
+                /*  var myChart = echarts.init(document.getElementById('chartContainer2'));
                // var myChart = ec.init(document.getElementById('chartContainer2'));   
                 var option = {                          
                 	color:['#e9af68','#57b7b6','#e4575a','#959eac','#ffa500',
@@ -303,14 +295,14 @@
             data:{{statisticsLend}}
         }
     ]
-};
+}; */
                 // 为echarts对象加载数据 
-                myChart.setOption(option); 
+               /*  myChart.setOption(option);  */
                     
                 //2 客户地区分布//
                 //3 最近30天客户数量地域//
                 // 基于准备好的dom，初始化echarts图表
-                var myChart = ec.init(document.getElementById('chartContainer3'));   
+               /*  var myChart = ec.init(document.getElementById('chartContainer3'));   
                 var option = {
                           title : {
                               text: '30天锁单位分布',
@@ -342,6 +334,8 @@
         }
     ]
 };
+                
+                
 var ecConfig = require('echarts/config');
 myChart.on(ecConfig.EVENT.PIE_SELECTED, function (param){
     var selected = param.selected;
@@ -360,13 +354,13 @@ myChart.on(ecConfig.EVENT.PIE_SELECTED, function (param){
 })
                     
                 // 为echarts对象加载数据 
-                myChart.setOption(option); 
+                myChart.setOption(option);  */
                     
                 //3 单位地区分布//                
 //             }
 //         );
         
-        function longleSt(){
+       /*  function longleSt(){
         	 var form = $('#LST'); 
         	// $('#districtLv').val(2);
         	 form.submit();  
@@ -376,7 +370,7 @@ myChart.on(ecConfig.EVENT.PIE_SELECTED, function (param){
         	 var form = $('#LST'); 
          	
          	 form.submit();  
-        }
+        } */
         
     </script>