培训班结算营收

.idea/cld.iml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/cld.iml" filepath="$PROJECT_DIR$/.idea/cld.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

protected/controller/MainController.php

@@ -4425,7 +4425,6 @@ class MainController extends DooController {
 		Doo::loadModel ( 'company' );
 		
 		Doo::loadModel ( 'service_log' );
-		
 		$service_log = new service_log ();
 		
 		$company = new company ();
@@ -4447,8 +4446,8 @@ class MainController extends DooController {
 		}
 		
 		// 获取锁
-		$longleInfo = $longle->getLongleByClient ( $clientname );
-		
+		$longleInfo = $longle->getLongleByClientid ( $clientname );
+
 		$k = "";
 		foreach ( $longleInfo as $key => $value ) {
 			if ($value ['status'] == 6 || $value ['status'] == 7)
@@ -4459,10 +4458,8 @@ class MainController extends DooController {
 		
 		// 获取办事人
 		$staffInfo = $client_staff->getClientByCid ( $clientInfo ['cid'] );
-		
 		// 获取公司信息
 		$companyInfo = $company->getCompanyByCid ( $clientInfo ['companyid'] );
-		
 		$serviceLog = $service_log->getServiceByClientid ( $clientInfo ['cid'] );
 		
 		$u = "";
@@ -4571,7 +4568,7 @@ class MainController extends DooController {
 				<tbody><tr><th>性别</th><td>' . $clientInfo ['gender'] . '</td><th>昵称</th><td>' . $clientInfo ['nicename'] . '</td></tr>
 				<tr><th>手机</th><td>' . $clientInfo ['telephone'] . '</td><th>QQ</th><td>' . $clientInfo ['qq'] . '</td></tr>
 				<tr><th>电话</th><td>' . $clientInfo ['phone'] . '</td><th>邮箱</th><td>' . $clientInfo ['email'] . '</td></tr>
-				<tr><th>软件锁</th><td colspan="3">' . $k . '</td></tr>
+				<tr><th>软件锁</th><td colspan="3"> <div class="lockContent">' . $k . '</div></td></tr>
 				<tr><td colspan="4">
 				</td></tr>
 				</tbody>
@@ -4597,7 +4594,7 @@ class MainController extends DooController {
 		echo json_encode ( $clientHtml );
 	}
 	function ajaxGetClientInfo() {
-		$clientname = $this->get_args ( 'client' ) ? $this->get_args ( 'client' ) : "";
+		$clientname = $this->get_args ( 'client' )&&is_numeric($this->get_args ( 'client' )) ? $this->get_args ( 'client' ) : "";
 		
 		if ($clientname == "") {
 			echo json_encode ( array (
@@ -4621,22 +4618,12 @@ class MainController extends DooController {
 		$client = new client ();
 		$client_staff = new client_staff ();
 		
-		$nameStr = explode ( ",", $clientname );
-		
-		// $clientname=$nameStr[1];
-		
-		if (! empty ( $nameStr [0] )) {
-			$clientInfo = $client->getOne ( array (
-					"where" => ' cid = "' . $nameStr [0] . '"',
-					'asArray' => TRUE 
-			) );
-		} elseif (! empty ( $nameStr [1] ))
-			$clientInfo = $client->getOne ( array (
-					"where" => ' clientname = "' . $nameStr [1] . '"',
-					'asArray' => TRUE 
-			) );
-		else
-			$clientInfo = array ();
+
+        $clientInfo = $client->getOne ( array (
+					"where" => ' cid = "' . $clientname . '"',
+					'asArray' => TRUE
+        ) );
+
 		
 		if (empty ( $clientInfo )) {
 			echo json_encode ( array (
@@ -4776,7 +4763,7 @@ class MainController extends DooController {
 		  					<tbody><tr><th>性别</th><td>' . $clientInfo ['gender'] . '</td><th>昵称</th><td>' . $clientInfo ['nicename'] . '</td></tr>
 		  					<tr><th>手机</th><td>' . $clientInfo ['telephone'] . '</td><th>QQ</th><td>' . $clientInfo ['qq'] . '</td></tr>
 		  					<tr><th>电话</th><td>' . $clientInfo ['phone'] . '</td><th>邮箱</th><td>' . $clientInfo ['email'] . '</td></tr>
-		  					<tr><th>软件锁</th><td colspan="3">' . $k . '</td></tr>
+		  					<tr><th>软件锁</th><td colspan="3"><div class="lockContent">' . $k . '</div></td></tr>
 		  					<tr><th>备注</th><td colspan="3">' . $clientInfo ['mark'] . '</td></tr>
 		  					<tr><td colspan="4">
 		  					' . $taghtml . '

protected/plugin/TemplateTag.php

@@ -62,8 +62,8 @@ function forMatAccess($access=array()){
 	return $html;
 }
 
-function countArray($list=array()){
-	return count($list);
+function countArray($list=array(),$count=0){
+	return count($list)+$count;
 }
 
 function isTimeTR($day = 3,$cTime) {

protected/view/admin/companyMonthCollectDetail.html

@@ -1,157 +1,159 @@
 <!-- include 'header' -->
-<link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/fixedheadertable.css"> 
+<link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/fixedheadertable.css">
 <script src="<?= WEB_SITE_GLOBAL ?>js/receipt.js"></script>
 <script src="<?= WEB_SITE_GLOBAL ?>js/jquery.fixedheadertable.js"></script>
 <body>
-	<div class="mainLayout">
-		<div class="mainMenu">
-			<div class="menuItem">
-				<a href="#" class="mLogo">CLD</a>
-				<ul>
-					<!-- include 'menuReceipt' -->
-				</ul>
-			</div>
-		</div>
-		<div class="warpContent">
-			<div class="subMenu fL">
-				<div class="menuItem">
-					<ul>
-					<!-- include 'receipt_menu' -->
-					</ul>
-				</div>
-			</div>
-			<div class="adminContent autoHeight" style="height: 821px;">
-				<legend><div class="fL"></div>员工每月报销单费用详情</legend>
-				<div class="demandCate">
-				<form action="/companyMonthCollectDetail" id="up" method="post">
-					<ul class="cateList">
-	  					<li><a class="now" href="/companyCategoryCollect">按办事处</a><a href="/staffCollect" >按员工</a></li>
-	  					<li><select name="year" id="Y" onchange="receiptYear();">
-	  					<!-- include 'year' -->
-	  					</select> 
-	  					 <select name="month" id="M" onchange="receiptYear();">
-		{{monthHtml}}
-	</select></li>
-	  					<li><b>{{month}}月</b>报销总计：￥{{stList.rePrice}}</li>
-	  					<li><b>{{month}}月</b>同意支付：<span class="colGreen">￥{{stList.agPrice}}</span></li>
-	  					<li><b>{{month}}月</b>审批中：￥{{stList.skPrice}}</li>
-	  			</ul>
-	  			</form>
-	  		</div>
-	  		<div class="saeaList">
-	  			<div class="entry autoHeightI2">	  			    
-	  			<script type="text/javascript">$(document).ready(function() {
-    $('#saeaTable').fixedHeaderTable({ fixedColumns:2 });
-});</script>
-	  				<table class="table table-bordered table-condensed table-hover fancyTable" id="saeaTable">
-	  				<thead>
-	  						<tr>
-	  						<th class="taC" rowspan="3">员工/费用项</th>
-	  						<th class="taC" rowspan="3">{{year}}年{{month}}月费用合计</th>
-	  						
-	  						<th class="taC" colspan="13">日常相关费用</th>
-	  						<th class="taC" colspan="6">差旅相关费用</th>
-	  						<th class="taC" colspan="9">培训班费用</th>
-	  						<th class="taC" colspan="5">其他</th>
-	  						<th class="taC" rowspan="2">报销金额调整</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>
-	  						<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>
-	  						<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>
-	  						<th class="taC">广告费</th>
-	  						<th class="taC">借款</th>
-	  						<th class="taC">可自加费用</th>
-	  						</tr>
-	  						
-	  						<tr class="warning">
-	  						<!-- loop monthPriceHtml -->
-	  						{{monthPriceHtml' value}}
-	  						<!-- endloop -->
-							
-							</tr>
-	  				</thead>
-	  					<tbody>
-	  					
-	  						<!-- loop list -->
-	  						<tr>
-	  						<th>{{list' key}}</th>
-	  						
-	  						
-	  						<!-- loop list' value -->
-	  						<!-- if {{list' value' key}}=='monthStaffPrice' -->
-	  							{{list' value' value}}
-	  						<!-- endif -->
-	  						<!-- endloop -->
-	  						
-	  						<!-- loop list' value -->
-	  						<!-- if {{list' value' key}}=='日常相关费用' -->
-	  							{{list' value' value}}
-	  						<!-- endif -->
-	  						<!-- endloop -->
-	  						
-	  						<!-- loop list' value -->
-	  						<!-- if {{list' value' key}}=='差旅相关费用' -->
-	  							{{list' value' value}}
-	  						<!-- endif -->
-	  						<!-- endloop -->
-	  						
-	  						<!-- loop list' value -->
-	  						<!-- if {{list' value' key}}=='培训班费用' -->
-	  							{{list' value' value}}
-	  						<!-- endif -->
-	  						<!-- endloop -->
-	  						
-	  						<!-- loop list' value -->
-	  						<!-- if {{list' value' key}}=='其他' -->
-	  							{{list' value' value}}
-	  						<!-- endif -->
-	  						<!-- endloop -->
-	  						
-	  						<!-- loop list' value -->
-	  						<!-- if {{list' value' key}}=='报销金额调整' -->
-	  							{{list' value' value}}
-	  						<!-- endif -->
-	  						<!-- endloop -->
-	  						
-	  						</tr>
-	  						<!-- endloop -->
-	  						</tbody>
-	  					</table>
-	  			</div>
-			</div>
-		</div>
-	</div>
-	
-<script type="text/javascript">autoFlashHeight();</script>	
+<div class="mainLayout">
+    <div class="mainMenu">
+        <div class="menuItem">
+            <a href="#" class="mLogo">CLD</a>
+            <ul>
+                <!-- include 'menuReceipt' -->
+            </ul>
+        </div>
+    </div>
+    <div class="warpContent">
+        <div class="subMenu fL">
+            <div class="menuItem">
+                <ul>
+                    <!-- include 'receipt_menu' -->
+                </ul>
+            </div>
+        </div>
+        <div class="adminContent autoHeight" style="height: 821px;">
+            <legend>
+                <div class="fL"></div>
+                员工每月报销单费用详情
+            </legend>
+            <div class="demandCate">
+                <form action="/companyMonthCollectDetail" id="up" method="post">
+                    <ul class="cateList">
+                        <li><a class="now" href="/companyCategoryCollect">按办事处</a><a href="/staffCollect">按员工</a></li>
+                        <li><select name="year" id="Y" onchange="receiptYear();">
+                            <!-- include 'year' -->
+                        </select>
+                            <select name="month" id="M" onchange="receiptYear();">
+                                {{monthHtml}}
+                            </select></li>
+                        <li><b>{{month}}月</b>报销总计：￥{{stList.rePrice}}</li>
+                        <li><b>{{month}}月</b>同意支付：<span class="colGreen">￥{{stList.agPrice}}</span></li>
+                        <li><b>{{month}}月</b>审批中：￥{{stList.skPrice}}</li>
+                    </ul>
+                </form>
+            </div>
+            <div class="saeaList">
+                <div class="entry autoHeightI2">
+                    <script type="text/javascript">$(document).ready(function () {
+                        $('#saeaTable').fixedHeaderTable({fixedColumns: 2});
+                    });</script>
+                    <table class="table table-bordered table-condensed table-hover fancyTable" id="saeaTable">
+                        <thead>
+                        <tr>
+                            <th class="taC" rowspan="3">员工/费用项</th>
+                            <th class="taC" rowspan="3">{{year}}年{{month}}月费用合计</th>
+
+                            <th class="taC" colspan="{{countArray(aiList.日常相关费用,1)}}">日常相关费用</th>
+                            <th class="taC" colspan="{{countArray(aiList.差旅相关费用,1)}}">差旅相关费用</th>
+                            <th class="taC" colspan="{{countArray(aiList.内部培训费用,1)}}">内部培训费用</th>
+                            <th class="taC" colspan="{{countArray(aiList.培训班费用,1)}}">培训班费用</th>
+                            <th class="taC" colspan="{{countArray(aiList.其他,1)}}">其他</th>
+                            <th class="taC" rowspan="2">报销金额调整</th>
+                        </tr>
+
+                        <tr>
+                            <th class="taC">合计</th>
+                            <!-- loop aiList.日常相关费用 -->
+                            <th class="taC">{{aiList' value.name}}</th>
+                            <!-- endloop -->
+
+
+                            <th class="taC">合计</th>
+                            <!-- loop aiList.差旅相关费用 -->
+                            <th class="taC">{{aiList' value.name}}</th>
+                            <!-- endloop -->
+
+                            <!-- //内部培训 -->
+                            <th class="taC">合计</th>
+                            <!-- loop aiList.内部培训费用 -->
+                            <th class="taC">{{aiList' value.name}}</th>
+                            <!-- endloop -->
+
+                            <th class="taC">合计</th>
+                            <!-- loop aiList.培训班费用 -->
+                            <th class="taC">{{aiList' value.name}}</th>
+                            <!-- endloop -->
+
+                            <th class="taC">合计</th>
+                            <!-- loop aiList.其他 -->
+                            <th class="taC">{{aiList' value.name}}</th>
+                            <!-- endloop -->
+
+                        </tr>
+
+                        <tr class="warning">
+                            <!-- loop monthPriceHtml -->
+                            {{monthPriceHtml' value}}
+                            <!-- endloop -->
+
+                        </tr>
+                        </thead>
+                        <tbody>
+
+                        <!-- loop list -->
+                        <tr>
+                            <th>{{list' key}}</th>
+
+
+                            <!-- loop list' value -->
+                            <!-- if {{list' value' key}}=='monthStaffPrice' -->
+                            {{list' value' value}}
+                            <!-- endif -->
+                            <!-- endloop -->
+
+                            <!-- loop list' value -->
+                            <!-- if {{list' value' key}}=='日常相关费用' -->
+                            {{list' value' value}}
+                            <!-- endif -->
+                            <!-- endloop -->
+
+                            <!-- loop list' value -->
+                            <!-- if {{list' value' key}}=='差旅相关费用' -->
+                            {{list' value' value}}
+                            <!-- endif -->
+                            <!-- endloop -->
+
+                            <!-- loop list' value -->
+                            <!-- if {{list' value' key}}=='内部培训费用' -->
+                            {{list' value' value}}
+                            <!-- endif -->
+                            <!-- endloop -->
+
+                            <!-- loop list' value -->
+                            <!-- if {{list' value' key}}=='培训班费用' -->
+                            {{list' value' value}}
+                            <!-- endif -->
+                            <!-- endloop -->
+
+                            <!-- loop list' value -->
+                            <!-- if {{list' value' key}}=='其他' -->
+                            {{list' value' value}}
+                            <!-- endif -->
+                            <!-- endloop -->
+
+                            <!-- loop list' value -->
+                            <!-- if {{list' value' key}}=='报销金额调整' -->
+                            {{list' value' value}}
+                            <!-- endif -->
+                            <!-- endloop -->
+
+                        </tr>
+                        <!-- endloop -->
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/javascript">autoFlashHeight();</script>
 </body>

protected/view/admin/expensesCollect.html

@@ -74,13 +74,19 @@
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.travelSum}}</td></tr>
-	  						
-	  						<tr><th colspan="2" class="taC">培训班费用</th></tr>
+
+
+
+
+							<tr><th colspan="2" class="taC">培训班费用</th></tr>
 	  						<!-- loop receiptDetail' value.accountItem.培训班费用 -->
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.trainSum}}</td></tr>
-	  						
+
+
+
+
 	  						<tr><th colspan="2" class="taC">其他</th></tr>
 	  						<!-- loop receiptDetail' value.accountItem.其他 -->
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
@@ -427,13 +433,20 @@
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.travelSum}}</td></tr>
-	  						
-	  						<tr><th colspan="2" class="taC">培训班费用</th></tr>
-	  						<!-- loop receiptDetail' value.accountItem.培训班费用 -->
-	  						<tr><th>{{receiptDetail' value' value.name}}</th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
-	  						<!-- endloop -->
-	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.trainSum}}</td></tr>
-	  						
+
+
+							<!-- if isset({{receiptList' value.accountItem.内部培训费用}}) -->
+							<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+							<!-- loop receiptDetail' value.accountItem.内部培训费用 -->
+							<tr><th>{{receiptDetail' value' value.name}}</th><td  width="200" class="taR">
+								￥{{receiptDetail' value' value.price}}
+							</td>
+							</tr>
+							<!-- endloop -->
+							<tr><th class="taR">合计</th><td class="colGreen taR" id="inttrainResult">￥{{receiptDetail' value.accountItem.cSum.inttrainSum}}</td></tr>
+							<!-- endif -->
+
+
 	  						<tr><th colspan="2" class="taC">其他</th></tr>
 	  						<!-- loop receiptDetail' value.accountItem.其他 -->
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>

protected/view/admin/expensesDoc.html

@@ -494,13 +494,15 @@
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.travelSum}}</td></tr>
-	  						
-	  						<tr><th colspan="2" class="taC">培训班费用</th></tr>
-	  						<!-- loop receiptDetail' value.accountItem.培训班费用 -->
+
+						<!-- if isset({{receiptDetail' value.accountItem.内部培训费用}}) -->
+	  						<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+	  						<!-- loop receiptDetail' value.accountItem.内部培训费用 -->
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
 	  						<!-- endloop -->
-	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.trainSum}}</td></tr>
-	  						
+	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.inttrainSum}}</td></tr>
+	  					<!-- endif -->
+
 	  						<tr><th colspan="2" class="taC">其他</th></tr>
 	  						<!-- loop receiptDetail' value.accountItem.其他 -->
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>

protected/view/admin/hisImplement.html

@@ -203,7 +203,11 @@
 							<td>
 							
 							<!-- if {{receiptList' value.Rtype}}==3 -->
+								<!-- if {{receiptList' value.Texe}}=='true'&&{{receiptList' value.TRexe}}=='true'&&({{receiptList' value.status}}==1 || {{receiptList' value.status}}==6) -->
 								<a href="/receiptTrain/implement/{{receiptList' value.ridKey7}}.html" class="button" target="_blank">去执行</a>
+								<!-- else -->
+								<a href="/receiptTrain/implement/{{receiptList' value.ridKey7}}.html"  target="_blank">详情</a>
+								<!-- endif -->
 							<!-- else -->
 							<!-- if {{receiptList' value.Texe}}=='true'&&{{receiptList' value.TRexe}}=='true'&&({{receiptList' value.status}}==1 || {{receiptList' value.status}}==6) -->
 								<a href="/implement/{{receiptList' value.ridKey}}.html" class="button" target="_blank">去执行</a>

protected/view/admin/implement.html

@@ -615,13 +615,20 @@
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.travelSum}}</td></tr>
-	  						
-	  						<tr><th colspan="2" class="taC">培训班费用</th></tr>
-	  						<!-- loop receiptDetail' value.accountItem.培训班费用 -->
-	  						<tr><th>{{receiptDetail' value' value.name}}</th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
-	  						<!-- endloop -->
-	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.trainSum}}</td></tr>
-	  						
+
+
+							<!-- if isset({{receiptList' value.accountItem.内部培训费用}}) -->
+							<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+							<!-- loop receiptList' value.accountItem.内部培训费用 -->
+							<tr><th>{{receiptList' value' value.name}}</th><td  width="200" class="taR">
+								￥{{receiptList' value' value.price}}
+							</td>
+							</tr>
+							<!-- endloop -->
+							<tr><th class="taR">合计</th><td class="colGreen taR" id="inttrainResult">￥{{receiptList' value.accountItem.cSum.inttrainSum}}</td></tr>
+							<!-- endif -->
+
+
 	  						<tr><th colspan="2" class="taC">其他</th></tr>
 	  						<!-- loop receiptDetail' value.accountItem.其他 -->
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>

protected/view/admin/receiptStatisticsStaffDetail.html

@@ -25,7 +25,7 @@
 			
 			<form action="/receiptStatisticsStaffDetail" id="up" method="post">
 			<input type="hidden" name='username' value='{{username}}'>
-				<legend><div class="fL"><a class="icon- crumb" href="/staffCollectMonthDetail/{{year}}/{{month}}" title="返回上级">b</a></div>{{usernameEN}} {{month}}月费用列表</legend>
+				<legend><div class="fL"><a class="icon- crumb" href="/staffCollectMonthDetail/{{year}}/{{month}}/ONJOB" title="返回上级">b</a></div>{{usernameEN}} {{month}}月费用列表</legend>
 				<div class="demandCate">
 					<ul class="cateList">
 	  					<li><a href="/companyCategoryCollect">办事处</a><a href="#" class="now">员工</a></li>

protected/view/admin/receipt_menu.html

@@ -28,6 +28,7 @@
 						
 	<!-- endif -->
 	<!-- if isReceiptAuthorityShow({{staff.0.sid}}) -->
+	<li><a href="/receiptTrainRevenue" <!-- if {{receiptMemu}}=="receiptTrainRevenue" --> class="selected" <!-- endif --> >培训班结算</a></li>
 	<li><a href="/companyCategoryCollect" <!-- if {{receiptMemu}}=="companyCategoryCollect" --> class="selected" <!-- endif --> >公司汇总</a></li>			
 	<!-- endif -->
 	

protected/view/admin/receiptburEdi.html

@@ -200,8 +200,20 @@
 	  						<tr><th>{{receiptDetail' 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">￥{{receiptDetail' value' value.price}}</td></tr>
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.travelSum}}</td></tr>
-	  						
-	  						<tr><th colspan="2" class="taC">培训班费用</th></tr>
+
+							<!-- if isset({{receiptList' value.accountItem.内部培训费用}}) -->
+							<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+							<!-- loop receiptList' value.accountItem.内部培训费用 -->
+							<tr><th>{{receiptList' value' value.name}}</th><td  width="200" class="taR">
+								￥{{receiptList' value' value.price}}
+							</td>
+							</tr>
+							<!-- endloop -->
+							<tr><th class="taR">合计</th><td class="colGreen taR" id="inttrainResult">￥{{receiptList' value.accountItem.cSum.inttrainSum}}</td></tr>
+							<!-- endif -->
+
+
+							<tr><th colspan="2" class="taC">培训班费用</th></tr>
 	  						<!-- loop receiptList' value.accountItem.培训班费用 -->
 	  						<tr><th>{{receiptDetail' 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">￥{{receiptDetail' value' value.price}}</td></tr>
 	  						<!-- endloop -->

protected/view/admin/saeaCategoryCollectDetail.html

@@ -100,6 +100,35 @@
 			<th class="taR">合计</th>
 			{{collectArray.差旅相关费用.0}}
 		</tr>
+
+		<tr>
+			<th width="120" class="taC">内部培训费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+		<!-- loop collectHtml.内部培训费用 -->
+		<tr>
+			<th>{{collectHtml' key}}</th>
+			{{collectHtml' value}}
+		</tr>
+		<!-- endloop -->
+		<tr>
+			<th class="taR">合计</th>
+			{{collectArray.内部培训费用.0}}
+		</tr>
+
+
 		<tr>
 			<th width="120" class="taC">培训班费用</th>
 			<th class="taC" width="80">1月</th>

protected/view/admin/saeaLoanAddReceipt.html

@@ -10,6 +10,26 @@
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/swfuplad2/handlers.js"></script>
 
 <script type="text/javascript">
+
+	$(function() {
+	$("input[id^='inttrain_']").change(function() {
+console.log('sss');
+		$i=0;
+		$("input[id^='inttrain_']").each(function(i){
+			$i+=parseFloat(this.value);
+
+		});
+		$("#inttrainResult").html("￥"+$i.toFixed(2));
+		$("#inttrainR").val($i.toFixed(2));
+
+		var agencyR=$("#agencyR").val();
+		var otherR=parseFloat($("#otherR").val());
+		var travelR=parseFloat($("#travelR").val());
+		var RS=parseFloat($i)+parseFloat(agencyR)+travelR+otherR;
+
+		$("#RS").html("￥"+RS.toFixed(2));
+	});
+	})
 		var swfu;
 
 		window.onload = function() {
@@ -52,6 +72,9 @@
 
 			swfu = new SWFUpload(settings);
 	     };
+
+
+
 	</script>
  
  
@@ -191,7 +214,18 @@
 	  							<!-- endif -->
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colGreen taR" id="travelResult">￥0.00</td></tr>
-	  						
+
+							<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+							<!-- loop acItem -->
+							<!-- if {{acItem' value.category}} =="内部培训费用" -->
+							<tr>
+								<th>{{acItem' value.name}}</th>
+								<td  width="200" class="taR">￥<input type="number" id="inttrain_{{acItem' value.aid}}" name="inttrain[]" value="0" placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2"></td>
+							</tr>
+							<!-- endif -->
+							<!-- endloop -->
+							<tr><th class="taR">合计</th><td class="colGreen taR" id="inttrainResult">￥0.00</td></tr>
+
 	  						
 	  						<tr><th colspan="2" class="taC">培训班费用</th></tr>
 	  						<td colspan="2" class="taC"><p style="font-size:24px;margin:30px">如借款用于培训班，请在培训班结算中添加。</p></td>

protected/view/admin/saeaLoanEdiReceipt.html

@@ -3,6 +3,31 @@
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
  <script src="<?= WEB_SITE_GLOBAL ?>js/receipt.js"></script>
+
+ <script >
+	 $(function() {
+
+		 $("input[id^='inttrain_']").change(function() {
+
+			 $i=0;
+			 $("input[id^='inttrain_']").each(function(i){
+				 $i+=parseFloat(this.value);
+
+			 });
+			 $("#inttrainResult").html("￥"+$i.toFixed(2));
+			 $("#inttrainR").val($i.toFixed(2));
+
+			 var agencyR=$("#agencyR").val();
+			 var otherR=parseFloat($("#otherR").val());
+			 var travelR=parseFloat($("#travelR").val());
+			 var RS=parseFloat($i)+parseFloat(agencyR)+travelR+otherR;
+
+			 $("#RS").html("￥"+RS.toFixed(2));
+		 });
+
+	 })
+ </script>
+
 <body>
 	<div class="mainLayout">
 		<div class="mainMenu">
@@ -157,9 +182,23 @@
 	  							<!-- endif -->
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colGreen taR" id="travelResult">￥{{cSum.travelSum}}</td></tr>
-	  						
-	  						
-	  						<tr><th colspan="2" class="taC">培训班费用</th></tr>
+
+
+							<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+							<!-- loop acItem -->
+							<!-- if {{acItem' value.category}} =="内部培训费用" -->
+							<tr>
+								<th>{{acItem' value.name}}</th>
+								<td  width="200" class="taR">
+
+									￥<input type="number" id="inttrain_{{acItem' value.aid}}" name="inttrain[]" <!-- if !empty({{acItem' value.price}}) --> value="{{acItem' value.price}}" <!-- else --> value="0" <!-- endif --> placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2"></td>
+							</tr>
+							<!-- endif -->
+							<!-- endloop -->
+							<tr><th class="taR">合计</th><td class="colGreen taR" id="inttrainResult">￥{{cSum.inttrainSum}}</td></tr>
+
+
+							<tr><th colspan="2" class="taC">培训班费用</th></tr>
 	  						<!-- loop acItem -->
 		  						<!-- if {{acItem' value.category}} =="培训班费用" -->
 	  						<tr>

protected/view/admin/saeaStaffCollectDetail.html

@@ -123,6 +123,36 @@
 			<th class="taR">合计</th>
 			{{collectArray.差旅相关费用.0}}
 		</tr>
+
+
+		<tr>
+			<th width="120" class="taC">内部培训费用</th>
+			<th class="taC" width="80">1月</th>
+			<th class="taC" width="80">2月</th>
+			<th class="taC" width="80">3月</th>
+			<th class="taC" width="80">4月</th>
+			<th class="taC" width="80">5月</th>
+			<th class="taC" width="80">6月</th>
+			<th class="taC" width="80">7月</th>
+			<th class="taC" width="80">8月</th>
+			<th class="taC" width="80">9月</th>
+			<th class="taC" width="80">10月</th>
+			<th class="taC" width="80">11月</th>
+			<th class="taC" width="80">12月</th>
+			<th class="taC">总计</th>
+		</tr>
+		<!-- loop collectHtml.内部培训费用 -->
+		<tr>
+			<th>{{collectHtml' key}}</th>
+			{{collectHtml' value}}
+		</tr>
+		<!-- endloop -->
+		<tr>
+			<th class="taR">合计</th>
+			{{collectArray.内部培训费用.0}}
+		</tr>
+
+
 		<tr>
 			<th width="120" class="taC">培训班费用</th>
 			<th class="taC" width="80">1月</th>

protected/view/admin/saea_edit.html

@@ -4,7 +4,29 @@
 <script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
  <script src="<?= WEB_SITE_GLOBAL ?>js/receipt.js"></script>
  
-
+ <script >
+ $(function() {
+ 
+	 $("input[id^='inttrain_']").change(function() {
+			
+			$i=0;
+			$("input[id^='inttrain_']").each(function(i){
+				$i+=parseFloat(this.value);
+				
+			 });
+			$("#inttrainResult").html("￥"+$i.toFixed(2));
+			$("#inttrainR").val($i.toFixed(2));
+			
+			var agencyR=$("#agencyR").val();
+			var otherR=parseFloat($("#otherR").val());
+			var travelR=parseFloat($("#travelR").val());
+			var RS=parseFloat($i)+parseFloat(agencyR)+travelR+otherR;
+			
+			$("#RS").html("￥"+RS.toFixed(2));
+		});
+	 
+ })
+ </script>
  
  
 <body>
@@ -63,8 +85,22 @@
 	  							<!-- endif -->
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colGreen taR" id="travelResult">￥{{cSum.travelSum}}</td></tr>
+
+
+
+	  						<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+	  						<!-- loop acItem -->
+		  					<!-- if {{acItem' value.category}} =="内部培训费用" -->
+	  						<tr>
+	  						<th>{{acItem' value.name}}</th>
+	  						<td  width="200" class="taR">
 	  						
-	  						
+	  						￥<input type="number" id="inttrain_{{acItem' value.aid}}" name="inttrain[]" <!-- if !empty({{acItem' value.price}}) --> value="{{acItem' value.price}}" <!-- else --> value="0" <!-- endif --> placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2"></td>
+	  						</tr>
+	  							<!-- endif -->
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colGreen taR" id="inttrainResult">￥{{cSum.inttrainSum}}</td></tr>
+
 	  						
 	  						
 	  						<tr><th colspan="2" class="taC">其他</th></tr>

protected/view/admin/staffCollectMonthDetail.html

@@ -56,62 +56,43 @@
 	  						<tr>
 	  						<th class="taC" rowspan="3">员工/费用项</th>
 	  						<th class="taC" rowspan="3">{{year}}年{{month}}月费用合计</th>
-	  						
-	  						<th class="taC" colspan="18">日常相关费用</th>
-	  						<th class="taC" colspan="6">差旅相关费用</th>
-	  						<th class="taC" colspan="11">培训班费用</th>
-	  						<th class="taC" colspan="5">其他</th>
+
+								<th class="taC" colspan="{{countArray(aiList.日常相关费用,1)}}">日常相关费用</th>
+								<th class="taC" colspan="{{countArray(aiList.差旅相关费用,1)}}">差旅相关费用</th>
+								<th class="taC" colspan="{{countArray(aiList.内部培训费用,1)}}">内部培训费用</th>
+								<th class="taC" colspan="{{countArray(aiList.培训班费用,1)}}">培训班费用</th>
+								<th class="taC" colspan="{{countArray(aiList.其他,1)}}">其他</th>
 	  						<th class="taC" rowspan="2">报销金额调整</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>
-	  						<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>
-	  						
+								<!-- loop aiList.日常相关费用 -->
+								<th class="taC">{{aiList' value.name}}</th>
+								<!-- endloop -->
+
 	  						<th class="taC">合计</th>
-	  						<th class="taC">往来交通费</th>
-	  						<th class="taC">市内交通费</th>
-	  						<th class="taC">出差住宿费</th>
-	  						<th class="taC">出差补助</th>
-	  						<th class="taC">其他费用</th>
-	  						
+								<!-- loop aiList.差旅相关费用 -->
+								<th class="taC">{{aiList' value.name}}</th>
+								<!-- endloop -->
+
+								<!-- //内部培训 -->
+								<th class="taC">合计</th>
+								<!-- loop aiList.内部培训费用 -->
+								<th class="taC">{{aiList' value.name}}</th>
+								<!-- endloop -->
+
 	  						<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>
-	  						<th class="taC">邮寄费</th>
+								<!-- loop aiList.培训班费用 -->
+								<th class="taC">{{aiList' value.name}}</th>
+								<!-- endloop -->
 	  						
 	  						<th class="taC">合计</th>
-	  						<th class="taC">公关费</th>
-	  						<th class="taC">广告费</th>
-	  						<th class="taC">借款</th>
-	  						<th class="taC">可自加费用</th>
+								<!-- loop aiList.其他 -->
+								<th class="taC">{{aiList' value.name}}</th>
+								<!-- endloop -->
 	  						</tr>
 	  						
-	  						<tr class="warning">
+	  						<tr  class="warning">
 	  						<!-- loop monthPriceHtml -->
 	  						{{monthPriceHtml' value}}
 	  						<!-- endloop -->
@@ -122,7 +103,12 @@
 	  						
 	  						<!-- loop list -->
 	  						<tr>
-	  						<th><a href="/receiptStatisticsStaffDetail?&username={{list' value.usernameEn}}&year={{year}}&month={{month}}"  >{{list' key}}</a></th>
+								<!-- if {{list' value.usernameEn}} -->
+								<th><a href="/receiptStatisticsStaffDetail?&username={{list' value.usernameEn}}&year={{year}}&month={{month}}"  >{{list' key}}</a></th>
+								<!-- else -->
+								<th>{{list' key}}</th>
+								<!-- endif -->
+
 	  						
 	  						<!-- loop list' value -->
 	  						<!-- if {{list' value' key}}=='monthStaffPrice' -->
@@ -141,7 +127,13 @@
 	  							{{list' value' value}}
 	  						<!-- endif -->
 	  						<!-- endloop -->
-	  						
+
+								<!-- loop list' value -->
+								<!-- if {{list' value' key}}=='内部培训费用' -->
+								{{list' value' value}}
+								<!-- endif -->
+								<!-- endloop -->
+
 	  						<!-- loop list' value -->
 	  						<!-- if {{list' value' key}}=='培训班费用' -->
 	  							{{list' value' value}}

protected/view/receipt/receiptTrainRevenue.html

@@ -0,0 +1,166 @@
+<!-- include '../header' -->
+<script src="<?= receipt ?>"></script>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<!-- include '../admin/menuReceipt' -->
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<!-- include '../admin/receipt_menu' -->
+				</div>
+			</div>
+				<div class="adminContent autoHeight">
+					<div class="saea-borad">
+						<div class="borad-menu">
+						</div>
+						<div class="borad-news">
+							<div class="saeaList">
+								<div class="clearfix">
+	                                <div id="chartContainer3" style="height: 300px; width: 100%;">
+	                                </div>
+	                            </div>
+								<!--预留-->
+								<!-- <div class="clearfix">
+									<legend><div class="fR"></div>待处理（收款转入）</legend>
+									<table class="table table-bordered table-condensed">
+										<tbody>
+										<tr><th class="taC" width="140">收款金额</th><th class="taC">银行到帐信息</th><th class="taC">银行/到帐时间</th><th class="taC">收款录入</th><th class="taC">操作</th></tr>
+										</tbody>
+									</table>
+								</div> -->
+								<div class="clearfix">
+									<legend>收款未完成</legend>
+									<table class="table table-bordered table-condensed">
+										<tbody>
+										<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></tr>
+										<tr>
+											<th><a href="saea-train-detail.html">XXX培训班</a></th>
+											<td class="taC">2019-05-01</td>
+											<td class="taC">2019-05-16</td>
+											<td class="taR">￥300000.00</td>
+											<td class="taR">￥270000.00</td>
+											<td class="taR colRed">￥30000.00</td>
+										</tr>
+										</tbody>
+									</table>
+								</div>
+								<div class="clearfix">
+									<legend><div class="fR"><a href="saea-train-all.html">所有培训班</a></div>最近收款完成</legend>
+									<table class="table table-bordered table-condensed">
+										<tbody>
+										<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></tr>
+										<tr>
+											<th><a href="saea-train-detail.html">XXX培训班</a></th>
+											<td class="taC">2019-05-01</td>
+											<td class="taC">2019-05-16</td>
+											<td class="taR">￥300000.00</td>
+											<td class="taR">￥70000.00</td>
+											<td class="taR">￥130000.00</td>
+										</tr>
+										</tbody>
+									</table>
+								</div>
+							</div>
+						</div>
+					</div>
+			</div>
+<script type="text/javascript">autoFlashHeight();</script>
+    <script type="text/javascript">
+	    // 基于准备好的dom，初始化echarts图表
+	    var myChart = echarts.init(document.getElementById('chartContainer3'));
+	    var option = {
+	        color: ["#F56954", "#00A65A", "#3C8DBC"],
+	        title: {
+	            text: '培训班营收图表'
+	        },
+	        tooltip: {
+	            trigger: 'axis',
+	            formatter: "{b} <br/>{a}：{c} 元<br/>{a1}：{c1} 元<br/>{a2}：{c2} 元"
+	        },
+	        legend: {
+	            data: ['支出', '收入', '利润']
+	        },
+	        toolbox: {
+	            show: true,
+	            feature: {
+	                magicType: { show: true, type: ['line', 'bar'] }
+	            }
+	        },
+	        dataZoom: {
+	            show: true,
+	            start: 50,
+	            end: 100
+	        },
+	        xAxis: [{
+	            type: 'category',
+	            boundaryGap: true,
+	            data: [
+	                '2017-02', '2017-03', '2017-04', '2017-05', '2017-06', '2017-07', '2017-08', '2017-09', '2017-10'
+	            ]
+	        }],
+	        yAxis: [{
+	            type: 'value',
+	            axisLabel: {
+	                formatter: '{value} 元'
+	            },
+	            splitArea: { show: true }
+	        }],
+	        series: [{
+	                name: '支出',
+	                type: 'line',
+	                itemStyle: {
+	                    normal: {
+	                        lineStyle: {
+	                            shadowColor: 'rgba(0,0,0,0.4)',
+	                            shadowBlur: 5,
+	                            shadowOffsetX: 3,
+	                            shadowOffsetY: 3
+	                        }
+	                    }
+	                },
+	                data: [30, 40, 30, 40, 50, 60, 40, 55, 40]
+	            },
+	            {
+	                name: '收入',
+	                type: 'line',
+	                itemStyle: {
+	                    normal: {
+	                        lineStyle: {
+	                            shadowColor: 'rgba(0,0,0,0.4)',
+	                            shadowBlur: 5,
+	                            shadowOffsetX: 3,
+	                            shadowOffsetY: 3
+	                        }
+	                    }
+	                },
+	                data: [10, 20, 20, 10, 10, 10, 10, 5, 15]
+	            },
+	            {
+	                name: '利润',
+	                type: 'line',
+	                itemStyle: {
+	                    normal: {
+	                        lineStyle: {
+	                            shadowColor: 'rgba(0,0,0,0.4)',
+	                            shadowBlur: 5,
+	                            shadowOffsetX: 3,
+	                            shadowOffsetY: 3
+	                        }
+	                    }
+	                },
+	                data: [20, 20, 10, 30, 40, 50, 30, 50, 25]
+	            }
+	        ]
+	    };
+	    // 为echarts对象加载数据 
+	    myChart.setOption(option);
+	    //3 标段计量分布//
+    </script>
+</body>