Просмотр исходного кода

培训班结算汇总表;培训班协作。

Chente 7 лет назад
Родитель
Сommit
f4b77606a8

+ 1 - 3
js/global.js

@@ -23,7 +23,6 @@ function autoFlashHeight(){
     $(".censorHeight").height(seCensor-btnList-27);
 };
 $(window).resize(autoFlashHeight);
-
 $(function(){
   var infoHeight = $(".contactInfo").height();
 $(".zhzdFir").click(function () {
@@ -34,9 +33,8 @@ $(".amInput").children("label").children("input:checkbox").click(function(){
         // 当前未选中
         $(".amInput").find("input:checked").removeAttr("checked");
         $(this).attr("checked", "checked");
-      }                      
+      }
     });
-    
     $(".pmInput").children("label").children("input:checkbox").click(function(){
       if($(this).is(":checked")) {
         // 当前未选中

+ 2 - 0
saea-borad.html

@@ -72,6 +72,8 @@
 										<tr><th>培训班结算</th><td><a href="saea-train-edit.html">#P201405291714(点我)</a></td><td class="taR">¥51000.00</td><td><span>未提交</span></td><td width="120"><a class="button btn-gray  btn-inline" href="saea-edit.html">返回编辑</a><a class="button btn-inline" href="">提交审批</a></td></tr>
 										<!--培训班撤回-->
 										<tr><th>培训班结算</th><td><a href="saea-train-edit.html">#P201405291714</a></td><td class="taR">¥51000.00</td><td><span class="colOrange">撤回</span></td><td width="120"><a class="button btn-gray  btn-inline" href="saea-train-edit.html">返回编辑</a><a class="button btn-inline" href="">继续审批</a></td></tr>
+										<!--培训班协作-->
+										<tr><th>培训班结算</th><td><a href="saea-train-edit.html">#P201405291714</a></td><td class="taR">¥51000.00</td><td><span>未提交</span></td><td width="120"><a class="button  btn-block" href="">协作</a></td></tr>
 										</tbody>
 									</table>
 								</div>

+ 49 - 27
saea-myList-detail2.html

@@ -109,82 +109,104 @@
 						</table>
 			  			<!--汇总表-->
 			  			<legend>汇总表</legend>
-			  			<table class="table table-bordered table-condensed table-hover">
-							<tbody>
+			  			<table class="table table-condensed table-hover table-bordered">
+								<tr>
+									<th class="taC" rowspan="2">汇总项目</th><th class="taC" colspan="2">收入按开票金额计算</th><th class="taC" colspan="2">收入按入账金额计算</th>
+								<tr>
+									<th class="taC">金额</th><th class="taC">占比</th><th class="taC">金额</th><th class="taC">占比</th>
+								</tr>
+								<tr>
+									<th>收入</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
+								</tr>
+								<tr>
+									<th>支出</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
+								</tr>
 								<tr>
-									<th class="taC" colspan="2">项目</th><th class="taC">人数</th><th class="taC">单价</th><th class="taC">金额</th><th class="taC" rowspan="2">占比</th><th class="taC" width="300">备注</th>
+									<th>利润</th><td class="taR"><b>0</b></td><td class="taR">0%</td><td class="taR"><b>0</b></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">收入</th><td>0</td><td>0</td><td>0</td><td></td>
+									<td colspan="5" class="taC colGray">收入-支出=利润</td>
 								</tr>
 								<tr>
-									<th rowspan="15" width="20">支出明细</th><th >交通费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>公司利润</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th rowspan="2">讲课费</th><td colspan="2" class="taC colGray">外聘</td><td class="taR">0<!--外聘--></td><td></td><td></td>
+									<th>办事处利润</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td colspan="2" class="taC colGray">员工</td><td class="taR">0<!--员工--></td><td></td><td></td>
+									<th>公司收款</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>住宿费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<td colspan="5" class="taC colGray">收入×40%=办事处利润&nbsp;&nbsp;&nbsp;收入×60%=公司利润</td>
 								</tr>
 								<tr>
-									<th>场租费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>备用金(借款)</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th rowspan="2">办公费</th><td colspan="2" class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td></td><td></td>
+									<th>办事处收款</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td colspan="2" class="taC colGray">公司支出</td><td class="taR">0<!--公司支出--></td><td></td><td></td>
+									<th>办事处实际支出</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>电话费<!--新增--></th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>付总部款</th><td class="taR"><b>0</b></td><td class="taR">0%</td><td class="taR"><b>0</b></td><td class="taR">0%</td>
+								</tr>
+								<tr>
+									<td colspan="5" class="taC colGray">备用金+办事处收款-办事处实际支出=付总部款</td>
+								</tr>
+								<tr><td colspan="5">学员:36 人&nbsp;&nbsp;&nbsp;讲师:36 人</td></tr>
+						</table>
+			  			<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+								<tr>
+									<th class="taC" colspan="2">支出项目</th><th class="taC" >金额</th><th class="taC" width="150">占开票金额比例</th>
+								</tr>
+								<tr><th>交通费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th rowspan="2">邮寄费</th><td colspan="2" class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td></td><td></td>
+									<th rowspan="3">讲课费</th><td class="taC colGray">外聘</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td colspan="2" class="taC colGray">公司支出</td><td  class="taR">0<!--公司支出--></d><td></td><td></td>
+									<td class="taC colGray">外聘(不计税)</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>公关费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<td class="taC colGray">员工</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>其他</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>住宿费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>税款</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>场租费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>研究中心经费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th rowspan="2">办公费</th><td class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>小计</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<td class="taC colGray">公司支出</td><td class="taR">0<!--公司支出--></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">利润</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th >电话费<!--新增--></th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">备用金(预借)</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th rowspan="2" >邮寄费</th><td class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">公司收款</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<td class="taC colGray">公司支出</td><td  class="taR">0<!--公司支出--></d><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">办事处收款</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th >公关费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">公司利润</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th >其他</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">办事处利润</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>税款</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">办事处实际支出</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>研究中心经费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">付总部款</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>支出小计</th><td class="taR" colspan="2"><b>0</b></td><td class="taR"><b>0%</b></td>
 								</tr>
 							</tbody>
 						</table>

+ 27 - 21
saea-receipt-add.html

@@ -88,7 +88,7 @@
 			  						<tr><th class="taR">合计</th><td class="colGreen taR">¥0.00</td></tr>
 			  						<tr><th colspan="2" class="taC">公关费绑定发票</th></tr>
 			  						<tr><th class="colRed">本次报销有公关费支出,确认是否涉需要绑定发票</th><td class="taR"><select class="span2"><option>绑定开票</option><option>不需要</option></select></td></tr>
-			  						<tr><th></th><td class="taR"><a class="button">添加发票</a></select></td></tr>
+			  						<tr><th></th><td class="taR"><a class="button" href="#add-invoice" data-toggle="modal">添加发票</a></select></td></tr>
 			  						<tr><th>发票</a></th><td class="taR">公关费(¥500.00)</td></tr>
 			  						<tr><th><a href="#">#F201909187362</a> <a class="fR">移除</a></th><td class="taR">¥<input type="number" value="0" placeholder="输入可自加费用" pattern="[0-9]" step="1" min="0" class="span2"></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>
@@ -148,26 +148,32 @@
 				</div>
 		</div>
 	</div>
-	<!--弹出-->
-<div class="modal hide fade" id="addCallout">
-    <div class="modal-header">
-    <h3>添加批注</h3>
-    </div>
-    <div class="modal-body">
-    <form class="">
-	    	<div class="control-group">
-				<div class="controls clearfix">
-					<label>
-	                	批注内容
-	              	</label>
-	              	<textarea rows="8" class="span6"></textarea>
-				</div>
-	    	</div>
-    </form>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">取消</a>
-	   	<a href="#" class="button">确定</a>
+	<!--弹出 添加发票-->
+<div class="modal hide fade" id="add-invoice">
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
+		    <div class="modal-header">
+		    <h3>添加发票</h3>
+		    </div>
+		    <div class="modal-body">
+		     	<blockquote>
+					<p>暂时没有查询到“珠海XXXX公司”的未入账发票</p>
+					<p></p><div class="input-append">
+							<input class="datepicker-here span4" placeholder="你可以按关键词模糊搜索" data-range="true" data-multiple-dates-separator=" - " data-language="zh" type="text">
+							<button class="btn btn-small" type="button">查询</button>
+					</div><p></p>
+				</blockquote>
+				<table class="table table-bordered table-condensed">
+					<thead><tr><th>开票单位(抬头)</th><th>开票金额</th><th>结算方式</th><th>提交开票</th><th>出票</th><th>开票流水号</th><th width="80">入账</th></tr></thead>
+					<tbody>
+						<tr><td>珠海XXXX公司</td><td>¥3000.00专</td><td>培训班(<a href="invoice-batch-detail.html" target="_blank">查看</a>)</td><td>广东办刘飞<br> 2016-03-03</td><td>黄爱玲<br>2016-03-03</td><td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td><td><a class="button btn-block" href="#">添加</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>
     <!--弹出内容-->

+ 49 - 27
saea-reportList-pay-detail2.html

@@ -111,82 +111,104 @@
 						</table>
 			  			<!--汇总表-->
 			  			<legend>汇总表</legend>
-			  			<table class="table table-bordered table-condensed table-hover">
-							<tbody>
+			  			<table class="table table-condensed table-hover table-bordered">
+								<tr>
+									<th class="taC" rowspan="2">汇总项目</th><th class="taC" colspan="2">收入按开票金额计算</th><th class="taC" colspan="2">收入按入账金额计算</th>
+								<tr>
+									<th class="taC">金额</th><th class="taC">占比</th><th class="taC">金额</th><th class="taC">占比</th>
+								</tr>
+								<tr>
+									<th>收入</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
+								</tr>
+								<tr>
+									<th>支出</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
+								</tr>
 								<tr>
-									<th class="taC" colspan="2">项目</th><th class="taC">人数</th><th class="taC">单价</th><th class="taC">金额</th><th class="taC" rowspan="2">占比</th><th class="taC" width="300">备注</th>
+									<th>利润</th><td class="taR"><b>0</b></td><td class="taR">0%</td><td class="taR"><b>0</b></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">收入</th><td>0</td><td>0</td><td>0</td><td></td>
+									<td colspan="5" class="taC colGray">收入-支出=利润</td>
 								</tr>
 								<tr>
-									<th rowspan="15" width="20">支出明细</th><th >交通费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>公司利润</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th rowspan="2">讲课费</th><td colspan="2" class="taC colGray">外聘</td><td class="taR">0</td><td></td><td></td>
+									<th>办事处利润</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td colspan="2" class="taC colGray">员工</td><td class="taR">0</td><td></td><td></td>
+									<th>公司收款</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>住宿费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<td colspan="5" class="taC colGray">收入×40%=办事处利润&nbsp;&nbsp;&nbsp;收入×60%=公司利润</td>
 								</tr>
 								<tr>
-									<th>场租费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>备用金(借款)</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th rowspan="2">办公费</th><td colspan="2" class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td></td><td></td>
+									<th>办事处收款</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td colspan="2" class="taC colGray">公司支出</td><td class="taR">0<!--公司支出--></td><td></td><td></td>
+									<th>办事处实际支出</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>电话费<!--新增--></th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>付总部款</th><td class="taR"><b>0</b></td><td class="taR">0%</td><td class="taR"><b>0</b></td><td class="taR">0%</td>
+								</tr>
+								<tr>
+									<td colspan="5" class="taC colGray">备用金+办事处收款-办事处实际支出=付总部款</td>
+								</tr>
+								<tr><td colspan="5">学员:36 人&nbsp;&nbsp;&nbsp;讲师:36 人</td></tr>
+						</table>
+			  			<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+								<tr>
+									<th class="taC" colspan="2">支出项目</th><th class="taC" >金额</th><th class="taC" width="150">占开票金额比例</th>
+								</tr>
+								<tr><th>交通费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th rowspan="2">邮寄费</th><td colspan="2" class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td></td><td></td>
+									<th rowspan="3">讲课费</th><td class="taC colGray">外聘</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td colspan="2" class="taC colGray">公司支出</td><td  class="taR">0<!--公司支出--></d><td></td><td></td>
+									<td class="taC colGray">外聘(不计税)</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>公关费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<td class="taC colGray">员工</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>其他</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>住宿费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>税款</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>场租费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>研究中心经费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th rowspan="2">办公费</th><td class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>小计</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<td class="taC colGray">公司支出</td><td class="taR">0<!--公司支出--></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">利润</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th >电话费<!--新增--></th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">备用金(预借)</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th rowspan="2" >邮寄费</th><td class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">公司收款</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<td class="taC colGray">公司支出</td><td  class="taR">0<!--公司支出--></d><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">办事处收款</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th >公关费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">公司利润</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th >其他</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">办事处利润</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>税款</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">办事处实际支出</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>研究中心经费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">付总部款</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>支出小计</th><td class="taR" colspan="2"><b>0</b></td><td class="taR"><b>0%</b></td>
 								</tr>
 							</tbody>
 						</table>

+ 11 - 0
saea-reportList-pay.html

@@ -71,6 +71,17 @@
 	  					<tbody>
 	  						<tr>
 	  							<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
+								<td>培训班结算</td>
+	  							<td class="taR colOrange"><b>¥1212.00</b></td>
+		  						<td></td>
+	  							<td>广东办</td>
+	  							<td>#B201405286811<p class="colGray">2015-2-21</p></td></td>
+	  							<td>说明说明说明说明</td>
+								<td class="colGreen">费用完成<p class="colGray">2015-2-23</p></td>
+	  							<td><a class="button" href="saea-reportList-pay-detail2.html">去执行</a></td>
+	  						</tr>
+	  						<tr>
+	  							<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>
 								<td>报销单</td>
 	  							<td class="taR colOrange"><b>¥1212.00</b></td>
 		  						<td></td>

+ 49 - 27
saea-reportList-report2.html

@@ -111,82 +111,104 @@
 						</table>
 			  			<!--汇总表-->
 			  			<legend>汇总表</legend>
-			  			<table class="table table-bordered table-condensed table-hover">
-							<tbody>
+			  			<table class="table table-condensed table-hover table-bordered">
+								<tr>
+									<th class="taC" rowspan="2">汇总项目</th><th class="taC" colspan="2">收入按开票金额计算</th><th class="taC" colspan="2">收入按入账金额计算</th>
+								<tr>
+									<th class="taC">金额</th><th class="taC">占比</th><th class="taC">金额</th><th class="taC">占比</th>
+								</tr>
+								<tr>
+									<th>收入</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
+								</tr>
+								<tr>
+									<th>支出</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
+								</tr>
 								<tr>
-									<th class="taC" colspan="2">项目</th><th class="taC">人数</th><th class="taC">单价</th><th class="taC">金额</th><th class="taC" rowspan="2">占比</th><th class="taC" width="300">备注</th>
+									<th>利润</th><td class="taR"><b>0</b></td><td class="taR">0%</td><td class="taR"><b>0</b></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">收入</th><td>0</td><td>0</td><td>0</td><td></td>
+									<td colspan="5" class="taC colGray">收入-支出=利润</td>
 								</tr>
 								<tr>
-									<th rowspan="15" width="20">支出明细</th><th >交通费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>公司利润</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th rowspan="2">讲课费</th><td colspan="2" class="taC colGray">外聘</td><td class="taR">0</td><td></td><td></td>
+									<th>办事处利润</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td colspan="2" class="taC colGray">员工</td><td class="taR">0</td><td></td><td></td>
+									<th>公司收款</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>住宿费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<td colspan="5" class="taC colGray">收入×40%=办事处利润&nbsp;&nbsp;&nbsp;收入×60%=公司利润</td>
 								</tr>
 								<tr>
-									<th>场租费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>备用金(借款)</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th rowspan="2">办公费</th><td colspan="2" class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td></td><td></td>
+									<th>办事处收款</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td colspan="2" class="taC colGray">公司支出</td><td class="taR">0<!--公司支出--></td><td></td><td></td>
+									<th>办事处实际支出</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>电话费<!--新增--></th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>付总部款</th><td class="taR"><b>0</b></td><td class="taR">0%</td><td class="taR"><b>0</b></td><td class="taR">0%</td>
+								</tr>
+								<tr>
+									<td colspan="5" class="taC colGray">备用金+办事处收款-办事处实际支出=付总部款</td>
+								</tr>
+								<tr><td colspan="5">学员:36 人&nbsp;&nbsp;&nbsp;讲师:36 人</td></tr>
+						</table>
+			  			<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+								<tr>
+									<th class="taC" colspan="2">支出项目</th><th class="taC" >金额</th><th class="taC" width="150">占开票金额比例</th>
+								</tr>
+								<tr><th>交通费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th rowspan="2">邮寄费</th><td colspan="2" class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td></td><td></td>
+									<th rowspan="3">讲课费</th><td class="taC colGray">外聘</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td colspan="2" class="taC colGray">公司支出</td><td  class="taR">0<!--公司支出--></d><td></td><td></td>
+									<td class="taC colGray">外聘(不计税)</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>公关费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<td class="taC colGray">员工</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>其他</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>住宿费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>税款</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>场租费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>研究中心经费</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th rowspan="2">办公费</th><td class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th>小计</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<td class="taC colGray">公司支出</td><td class="taR">0<!--公司支出--></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">利润</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th >电话费<!--新增--></th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">备用金(预借)</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th rowspan="2" >邮寄费</th><td class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">公司收款</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<td class="taC colGray">公司支出</td><td  class="taR">0<!--公司支出--></d><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">办事处收款</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th >公关费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">公司利润</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th >其他</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">办事处利润</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>税款</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">办事处实际支出</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>研究中心经费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">付总部款</th><td colspan="3" class="taR">0</td><td></td><td></td>
+									<th>支出小计</th><td class="taR" colspan="2"><b>0</b></td><td class="taR"><b>0%</b></td>
 								</tr>
 							</tbody>
 						</table>

+ 1 - 0
saea-train-edit.html

@@ -55,6 +55,7 @@
 						  <li><a href="saea-train-edit4.html">收入</a></li>
 						  <li><a href="saea-train-edit5.html">支出</a></li>
 						  <li><a href="saea-train-edit6.html">讲师</a></li>
+						  <li><a href="saea-train-edit7.html">协作</a></li>
 						</ul>
 					</div>
 			  		<div class="saeaList">

+ 48 - 28
saea-train-edit2.html

@@ -55,89 +55,109 @@
 						  <li><a href="saea-train-edit4.html">收入</a></li>
 						  <li><a href="saea-train-edit5.html">支出</a></li>
 						  <li><a href="saea-train-edit6.html">讲师</a></li>
+						  <li><a href="saea-train-edit7.html">协作</a></li>
 						</ul>
 					</div>
 			  		<div class="saeaList">
 			  			<legend>汇总表</legend>
-			  			<table class="table table-bordered table-condensed table-hover">
-							<tbody>
+						<table class="table table-condensed table-hover table-bordered">
+								<tr>
+									<th class="taC" rowspan="2">汇总项目</th><th class="taC" colspan="2">收入按开票金额计算</th><th class="taC" colspan="2">收入按入账金额计算</th>
+								<tr>
+									<th class="taC">金额</th><th class="taC">占比</th><th class="taC">金额</th><th class="taC">占比</th>
+								</tr>
+								<tr>
+									<th>收入</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
+								</tr>
 								<tr>
-									<th class="taC" colspan="3">项目</th><th class="taC">人数</th><th class="taC">金额</th><th class="taC" rowspan="2">占比</th>
+									<th>支出</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="3">收入</th><td>0</td><td>0</td>
+									<th>利润</th><td class="taR"><b>0</b></td><td class="taR">0%</td><td class="taR"><b>0</b></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th rowspan="16" width="20">支出明细</th><th colspan="2">交通费</th><td colspan="2" class="taR">0</td><td></td>
+									<td colspan="5" class="taC colGray">收入-支出=利润</td>
 								</tr>
 								<tr>
-									<th rowspan="3" colspan="2">讲课费</th><td class="taC colGray">外聘</td><td class="taR">0</td><td></td>
+									<th>公司利润</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td class="taC colGray">外聘(不计税)</td><td class="taR">0</td><td></td>
+									<th>办事处利润</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td class="taC colGray">员工</td><td class="taR">0</td><td></td>
+									<th>公司收款</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">住宿费</th><td colspan="2" class="taR">0</td><td></td>
+									<td colspan="5" class="taC colGray">收入×40%=办事处利润&nbsp;&nbsp;&nbsp;收入×60%=公司利润</td>
 								</tr>
 								<tr>
-									<th colspan="2">场租费</th><td colspan="2" class="taR">0</td><td></td>
+									<th>备用金(借款)</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th rowspan="2" colspan="2">办公费</th><td class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td></td>
+									<th>办事处收款</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td class="taC colGray">公司支出</td><td class="taR">0<!--公司支出--></td><td></td>
+									<th>办事处实际支出</th><td class="taR">0</td><td class="taR">0%</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">电话费<!--新增--></th><td colspan="2" class="taR">0</td><td></td>
+									<th>付总部款</th><td class="taR"><b>0</b></td><td class="taR">0%</td><td class="taR"><b>0</b></td><td class="taR">0%</td>
+								</tr>
+								<tr>
+									<td colspan="5" class="taC colGray">备用金+办事处收款-办事处实际支出=付总部款</td>
+								</tr>
+								<tr><td colspan="5">学员:36 人&nbsp;&nbsp;&nbsp;讲师:36 人</td></tr>
+						</table>
+			  			<table class="table table-bordered table-condensed table-hover">
+							<tbody>
+								<tr>
+									<th class="taC" colspan="2">支出项目</th><th class="taC" >金额</th><th class="taC" width="150">占开票金额比例</th>
+								</tr>
+								<tr><th>交通费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th rowspan="2" colspan="2">邮寄费</th><td class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td></td>
+									<th rowspan="3">讲课费</th><td class="taC colGray">外聘</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<td class="taC colGray">公司支出</td><td  class="taR">0<!--公司支出--></d><td></td>
+									<td class="taC colGray">外聘(不计税)</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">公关费</th><td colspan="2" class="taR">0</td><td></td>
+									<td class="taC colGray">员工</td><td class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">其他</th><td colspan="2" class="taR">0</td><td></td>
+									<th>住宿费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">税款</th><td colspan="2" class="taR">0</td><td></td>
+									<th>场租费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">研究中心经费</th><td colspan="2" class="taR">0</td><td></td>
+									<th rowspan="2">办公费</th><td class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="2">小计</th><td colspan="2" class="taR">0</td><td></td>
+									<td class="taC colGray">公司支出</td><td class="taR">0<!--公司支出--></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="3">利润</th><td colspan="2" class="taR">0</td><td></td>
+									<th >电话费<!--新增--></th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="3">备用金(预借)</th><td colspan="2" class="taR">0</td><td></td>
+									<th rowspan="2" >邮寄费</th><td class="taC colGray">办事处支出</td><td class="taR">0<!--办事处支出--></td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="3">公司收款</th><td colspan="2" class="taR">0</td><td></td>
+									<td class="taC colGray">公司支出</td><td  class="taR">0<!--公司支出--></d><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="3">办事处收款</th><td colspan="2" class="taR">0</td><td></td>
+									<th >公关费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="3">公司利润</th><td colspan="2" class="taR">0</td><td></td>
+									<th >其他</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="3">办事处利润</th><td colspan="2" class="taR">0</td><td></td>
+									<th>税款</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="3">办事处实际支出</th><td colspan="2" class="taR">0</td><td></td>
+									<th>研究中心经费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
-									<th colspan="3">付总部款</th><td colspan="2" class="taR">0</td><td></td>
+									<th>支出小计</th><td class="taR" colspan="2"><b>0</b></td><td class="taR"><b>0%</b></td>
 								</tr>
 							</tbody>
 						</table>

+ 1 - 0
saea-train-edit3.html

@@ -54,6 +54,7 @@
                             <li><a href="saea-train-edit4.html">收入</a></li>
                             <li><a href="saea-train-edit5.html">支出</a></li>
                             <li><a href="saea-train-edit6.html">讲师</a></li>
+                            <li><a href="saea-train-edit7.html">协作</a></li>
                         </ul>
                     </div>
                     <div class="saeaList">

+ 1 - 0
saea-train-edit4.html

@@ -54,6 +54,7 @@
                             <li class="active"><a href="saea-train-edit4.html">收入</a></li>
                             <li><a href="saea-train-edit5.html">支出</a></li>
                             <li><a href="saea-train-edit6.html">讲师</a></li>
+                            <li><a href="saea-train-edit7.html">协作</a></li>
                         </ul>
                     </div>
                     <div class="saeaList">

+ 5 - 1
saea-train-edit5.html

@@ -55,6 +55,7 @@
 						  <li><a href="saea-train-edit4.html">收入</a></li>
 						  <li class="active"><a href="saea-train-edit5.html">支出</a></li>
 						  <li><a href="saea-train-edit6.html">讲师</a></li>
+						  <li><a href="saea-train-edit7.html">协作</a></li>
 						</ul>
 					</div>
 			  		<div class="saeaList">
@@ -63,7 +64,7 @@
 			  			<legend><div class="fR"><button type="submit" class="button" href="#add-expenses" data-toggle="modal">添加支出</button></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" width="90">金额</th><th class="taC">经手人</th><th class="taC">支出描述</th><th class="taC"></th>
+									<tr><th class="taC">序号</th><th class="taC">日期</th><th class="taC">类别</th><th class="taC" width="90">金额</th><th class="taC">经手人</th><th class="taC">支出描述</th><th class="taC">添加人/添加时间</th><th class="taC"></th>
 									<tr>
 										<td>1</td>
 										<td>8月24日</td>
@@ -71,6 +72,7 @@
 										<td>2980.00</td>
 										<td>陈叶婷</td>
 										<td>往来交通费</td>
+										<td>黄巾桃 2019-05-01 18:30:30</td>
 										<td><a href="">移除</a></td>
 									</tr>
 									<tr>
@@ -80,6 +82,7 @@
 										<td>20.00</td>
 										<td>陈叶婷</td>
 										<td>机票相关</td>
+										<td>黄巾桃 2019-05-01 18:30:30</td>
 										<td><a href="">移除</a></td>
 									</tr><tr>
 										<td>3</td>
@@ -88,6 +91,7 @@
 										<td>1050.00</td>
 										<td>陈叶婷 黄巾桃 李柔嘉</td>
 										<td>往来交通费</td>
+										<td>黄巾桃 2019-05-01 18:30:30</td>
 										<td><a href="">移除</a></td>
 									</tr>
 								</tbody>

+ 8 - 3
saea-train-edit6.html

@@ -55,6 +55,7 @@
 						  <li><a href="saea-train-edit4.html">收入</a></li>
 						  <li><a href="saea-train-edit5.html">支出</a></li>
 						  <li class="active"><a href="saea-train-edit6.html">讲师</a></li>
+						  <li><a href="saea-train-edit7.html">协作</a></li>
 						</ul>
 					</div>
 			  		<div class="saeaList">
@@ -63,12 +64,13 @@
 			  			<legend><div class="fR"><button type="submit" class="button" href="#add-teach" data-toggle="modal">添加讲师</button></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></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></tr>
 									<tr>
 										<td>总部-何银龄</td>
 										<td>2</td>
 										<td>3000.00</td>
 										<td>6000.00</td>
+										<td>黄巾桃 2019-05-01 18:30:30</td>
 										<td><a href="">移除</a></td>
 									</tr>
 									<tr>
@@ -76,6 +78,7 @@
 										<td>1</td>
 										<td>2000.00</td>
 										<td>2000.00</td>
+										<td>黄巾桃 2019-05-01 18:30:30</td>
 										<td><a href="">移除</a></td>
 									</tr>
 									<tr>
@@ -83,6 +86,7 @@
 										<td>1</td>
 										<td>2000.00</td>
 										<td>2000.00</td>
+										<td>黄巾桃 2019-05-01 18:30:30</td>
 										<td><a href="">移除</a></td>
 									</tr>
 									<tr>
@@ -90,6 +94,7 @@
 										<td>1</td>
 										<td>2000.00</td>
 										<td>2000.00</td>
+										<td>黄巾桃 2019-05-01 18:30:30</td>
 										<td><a href="">移除</a></td>
 									</tr>
 								</tbody>
@@ -140,7 +145,7 @@
 							<th class="taC">日授课费</th><td><input value="0" placeholder="输入日授课费" pattern="[0-9]" min="0" step="10" type="number"></td>
 						</tr>
 						<tr>
-							<th class="taC">合计应发授课费</th><td></td>
+							<th class="taC">合计应发授课费</th><td><input value="0" placeholder="输入授课天数" pattern="[0-9]" min="0" step="0.5" type="number"></td>
 						</tr>
 						</tbody>
 					</table>
@@ -171,7 +176,7 @@
 							<th class="taC">日授课费</th><td><input value="0" placeholder="输入日授课费" pattern="[0-9]" min="0" step="10" type="number"></td>
 						</tr>
 						<tr>
-							<th class="taC">合计应发授课费</th><td></td>
+							<th class="taC">合计应发授课费</th><td><input value="0" placeholder="输入授课天数" pattern="[0-9]" min="0" step="0.5" type="number"></td>
 						</tr>
 						</tbody>
 					</table>

+ 102 - 0
saea-train-edit7.html

@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+	<meta charset=utf-8>
+	<title>CLD.System</title>
+	<meta name=description content=电子版晴雨表,在线晴雨表,网页晴雨表>
+	<link rel="shortcut icon" href="images/favicon.ico">
+	<meta name=copyright content=smartcost.com.cn>
+	<link rel=stylesheet href=css/global.css>
+	<script src=js/jquery-1.7.1.min.js></script>
+	<script src=js/global.js></script>
+</head>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<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="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="日程表"><a href="#" class="icon-">X</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="开发需求" class="topLine"><a href="#" class="icon-">V</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单"><a href="#" class="icon- selected">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="物品申请"><a href="#" class="icon-">W</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="saeaTitle">费用管理</li>
+						<li><a href="saea-borad.html">公布板</a></li>
+						<li><a href="saea-myList.html" class="selected">我的费用</a></li>
+						<li><a href="saea-slist-1.html">费用汇总</a></li>
+						<li class="topLine"><a href="saea-reportList.html">费用审批</a></li>
+						<li><a href="saea-reportList-pay.html">费用执行</a></li>
+						<li><a href="saea-reportList-remit.html">费用汇款</a></li>
+						<li><a href="saea-dlist-category-year.html">公司汇总</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight" style="height: 821px;">
+				<legend><div class="fR"><button type="submit" class="button" href="#confirm" data-toggle="modal">提交审批</button></div>编辑 广西办事处2018年8月广西路桥工程集团有限公司路面分公司企业培训</legend>
+				<div class="borad-news">
+					<div class="subNav">
+			    		<ul class="navTabs">
+						  <li><a href="saea-train-edit.html">信息</a></li>
+						  <li><a href="saea-train-edit2.html">汇总表</a></li>
+						  <li><a href="saea-train-edit3.html">借款</a></li>
+						  <li><a href="saea-train-edit4.html">收入</a></li>
+						  <li><a href="saea-train-edit5.html">支出</a></li>
+						  <li><a href="saea-train-edit6.html">讲师</a></li>
+						  <li class="active"><a href="saea-train-edit7.html">协作</a></li>
+						</ul>
+					</div>
+			  		<div class="saeaList">
+			  			<!--支出项-->
+			  			<div class="clearfix">
+			  			<legend><div class="fR"><button type="submit" class="button" href="#add-teach" data-toggle="modal">添加协作人</button></div>协作管理结算</legend>
+				  			<table class="table table-bordered table-condensed">
+								<tbody>
+									<tr><th class="taC">姓名</th><th class="taC"></th></tr>
+									<tr>
+										<td>广西办-陈叶婷</td>
+										<td><a href="">移除</a></td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+					</div>
+				</div>
+		</div>
+	</div>
+	<!--弹出 添加指出 -->
+    <div class="modal hide fade" id="add-teach">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h3>添加协作人</h3>
+                </div>
+                <div class="modal-body saeaList">
+                	<p>协作人可以与您一起管理培训班结算。</p>
+					<select>
+						<option>请选择</option>
+						<option>广西办-陈叶婷</option>
+					</select>
+                </div>
+                <div class="modal-footer">
+                	<a href="#" class="button" data-dismiss="modal" aria-hidden="true">确认</a>
+                    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--弹出内容-->
+<script type="text/javascript">autoFlashHeight();</script>
+</body>

+ 157 - 0
staff-commission-detail-org.html

@@ -0,0 +1,157 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+	<meta charset=utf-8>
+	<title>CLD.System</title>
+	<meta name=description content=电子版晴雨表,在线晴雨表,网页晴雨表>
+	<link rel="shortcut icon" href="images/favicon.ico">
+	<meta name=copyright content=smartcost.com.cn>
+	<link rel=stylesheet href=css/global.css>
+	<script src=js/jquery-1.7.1.min.js></script>
+	<script src=js/global.js></script>
+	<link href="css/datepicker.min.css" rel="stylesheet" type="text/css">
+	<script src="js/datepicker.min.js"></script>
+	<script src="js/datepicker.zh.js"></script>
+</head>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<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="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="发票申请"><a href="#" class="icon-">D</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="人资管理"><a href="#" class="icon- selected">m</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon- ">Z</a></li>
+				</ul>
+			</div>
+			<div class="userMenu">
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="staffTitle">人资管理</li>
+						<li><a href="staff-home.html">首页</a></li>
+						<li><a href="staff-organization.html">组织</a></li>
+						<li><a href="staff-employee.html">员工</a></li>
+						<li><a href="staff-payroll.html">工资</a></li>
+						<li><a href="staff-insurance.html">社保公积金</a></li>
+						<li><a href="staff-attendance.html">考勤</a></li>
+						<li><a href="staff-commission.html" class="selected">提成</a></li>
+						<li><a href="staff-commission-org.html">分配提成</a></li>
+						<li><a href="staff-affixation.html">附加收支项</a></li>
+						<li><a href="staff-welfare.html">福利奖金</a></li>
+						<li><a href="staff-guanaitong.html">关爱通</a></li>
+						<li><a href="staff-tax.html">六项专项扣除</a></li>
+						<li class="topLine"><a href="staff-set-job.html">岗位设置</a></li>
+						<li><a href="staff-set-insurance.html">社保设置</a></li>
+						<li><a href="staff-srt-commission.html">提成设置</a></li>
+						<li><a href="staff-set-approval.html">审批流程设置</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<div class="librarySide">
+					<div class="sideMnav">
+						<ul class="navLeve0 autoHeight">
+							<!-- <li class="title"><h3>组织列表</h3></li> -->
+							<li><a href="staff-commission.html">所有组织<a>
+							<li><span>总部</span>
+							<li><span>总部-研究中心</span><!-- <span class="icon- fR">a</span> --></li>
+							<li><span>总部-总经办</span></li>
+							<li><span>总部-财务部</span></li>
+							<li><span>总部-研发部</span></li>
+							<li><span>总部-测试与技术支持部</span></li>
+							<li><span>总部-综合管理部</span></li>
+							<li><span>甘肃办</span></li>
+							<li class="selected"><a href="staff-commission-detail-org.html">广东办(点我)</a></li>
+							<li><span>内蒙办</span></li>
+							<li><span>浙江办</span></li>
+							<li><span>安徽办</span></li>
+							<li><span>江西办</span></li>
+							<li><span>四川办</span></li>
+							<li><span>广西办</span></li>
+							<li><span>湖南办</span></li>
+							<li><span>山东办</span></li>
+							<li><span>重庆办</span></li>
+						</ul>
+					</div>
+				</div>
+				<div class="libraryContent adminContent autoHeight">
+					<legend>本月(05.01-05.31)广东办提成详情</legend>
+					<div class="demandCate">
+						<ul class="cateList">
+							<li>
+								<div class="search">
+									<div class="input-append">
+										<input class="datepicker-here span3" placeholder="选择月份" type="text" data-language="zh" data-min-view="months" data-view="months" style="width:100px">
+										<button class="btn btn-small" type="button">筛选</button>
+									</div>
+								</div>
+							</li>
+							<li>
+								<select class="select">
+									<option>汇总</option>
+									<option>详情</option>
+								</select>
+							</li>
+							<li>
+								<a class="button" href="#download" data-toggle="modal">下载5月提成</a>
+							</li>
+		  				</ul>
+		  			</div>
+					<div class="saeaList">
+						<table class="table table-hover">
+							<tbody>
+							<tr class="thead"><th width="80">工号</th><th>姓名</th><th>手机</th><th>聘用状态</th><th>办事处/部门</th><th>入职时间</th><th>离职时间</th><th>软件销售</th><th>培训班</th><th>讲课费</th><th>合计</th></tr>
+							<tr><td>Z0001</td><td>张三</td><td>12345678901</td><td>正式</td><td>广东办</td><td>2017-05-30</td><td class="colRed"></td><td>2000</td><td>0</td><td>0</td><td>2000</td></tr>
+							<tr><td>Z0002</td><td>王五</td><td>12345678901</td><td>实习</td><td>广东办</td><td>2017-05-30</td><td class="colRed"></td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+							<tr class="warning"><td>Z0003</td><td>李四</td><td>12345678901</td><td>试用</td><td>广东办</td><td>2017-05-30</td><td class="colRed">2018-07-30</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+							<tr><td>Z0004</td><td>王五</td><td>12345678901</td><td>正式</td><td>广东办</td><td>2017-05-30</td><td class="colRed">2018-07-30</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+							</tbody>
+						</table>
+					</div>
+					<div class="demandPage">
+						<ul class="pagination fL">
+							<li><a href="#">&lt;</a></li>
+							<li><a href="#">1</a></li>
+							<li class="active"><a href="#">2</a></li>
+							<li><a href="#">3</a></li>
+							<li><a href="#">4</a></li>
+							<li><a href="#">5</a></li>
+							<li><a href="#">&gt;</a></li>
+						</ul>
+				  	</div>
+				  </div>
+			</div>
+		</div>
+	</div>
+	<!--弹出下载数据-->
+	<div class="modal hide fade" id="download">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>下载5月提成数据</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<p><a href="#">CLD-5月广东办提成.xls</a></p>
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div>
+		</div>
+	</div>
+<script type="text/javascript">autoFlashHeight();</script>
+<script type="text/javascript">$('#need-data').modal('show2')</script>
+</body>

+ 290 - 0
staff-commission-detail-org2.html

@@ -0,0 +1,290 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+	<meta charset=utf-8>
+	<title>CLD.System</title>
+	<meta name=description content=电子版晴雨表,在线晴雨表,网页晴雨表>
+	<link rel="shortcut icon" href="images/favicon.ico">
+	<meta name=copyright content=smartcost.com.cn>
+	<link rel=stylesheet href=css/global.css>
+	<script src=js/jquery-1.7.1.min.js></script>
+	<script src=js/global.js></script>
+	<link href="css/datepicker.min.css" rel="stylesheet" type="text/css">
+	<script src="js/datepicker.min.js"></script>
+	<script src="js/datepicker.zh.js"></script>
+</head>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<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="#" class="icon-">A</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="#" class="icon-">C</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单" class="topLine"><a href="#" class="icon-">U</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="发票申请"><a href="#" class="icon-">D</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="人资管理"><a href="#" class="icon- selected">m</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广"><a href="#" class="icon- ">Z</a></li>
+				</ul>
+			</div>
+			<div class="userMenu">
+				<ul>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine"><a href="#" class="icon-">Y</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置"><a href="#" class="icon-">F</a></li>
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="#" class="icon-">G</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<ul>
+						<li class="staffTitle">人资管理</li>
+						<li><a href="staff-home.html">首页</a></li>
+						<li><a href="staff-organization.html">组织</a></li>
+						<li><a href="staff-employee.html">员工</a></li>
+						<li><a href="staff-payroll.html">工资</a></li>
+						<li><a href="staff-insurance.html">社保公积金</a></li>
+						<li><a href="staff-attendance.html">考勤</a></li>
+						<li><a href="staff-commission.html" class="selected">提成</a></li>
+						<li><a href="staff-commission-org.html">分配提成</a></li>
+						<li><a href="staff-affixation.html">附加收支项</a></li>
+						<li><a href="staff-welfare.html">福利奖金</a></li>
+						<li><a href="staff-guanaitong.html">关爱通</a></li>
+						<li><a href="staff-tax.html">六项专项扣除</a></li>
+						<li class="topLine"><a href="staff-set-job.html">岗位设置</a></li>
+						<li><a href="staff-set-insurance.html">社保设置</a></li>
+						<li><a href="staff-srt-commission.html">提成设置</a></li>
+						<li><a href="staff-set-approval.html">审批流程设置</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<div class="librarySide">
+					<div class="sideMnav">
+						<ul class="navLeve0 autoHeight">
+							<!-- <li class="title"><h3>组织列表</h3></li> -->
+							<li><a href="staff-commission.html">所有组织<a>
+							<li><span>总部</span>
+							<li><span>总部-研究中心</span><!-- <span class="icon- fR">a</span> --></li>
+							<li><span>总部-总经办</span></li>
+							<li><span>总部-财务部</span></li>
+							<li><span>总部-研发部</span></li>
+							<li><span>总部-测试与技术支持部</span></li>
+							<li><span>总部-综合管理部</span></li>
+							<li><span>甘肃办</span></li>
+							<li class="selected"><a href="staff-commission-detail-org.html">广东办(点我)</a></li>
+							<li><span>内蒙办</span></li>
+							<li><span>浙江办</span></li>
+							<li><span>安徽办</span></li>
+							<li><span>江西办</span></li>
+							<li><span>四川办</span></li>
+							<li><span>广西办</span></li>
+							<li><span>湖南办</span></li>
+							<li><span>山东办</span></li>
+							<li><span>重庆办</span></li>
+						</ul>
+					</div>
+				</div>
+				<div class="libraryContent adminContent autoHeight">
+					<legend>本月(05.01-05.31)广东办提成详情</legend>
+					<div class="demandCate">
+						<ul class="cateList">
+							<li>
+								<div class="search">
+									<div class="input-append">
+										<input class="datepicker-here span3" placeholder="选择月份" type="text" data-language="zh" data-min-view="months" data-view="months" style="width:100px">
+										<button class="btn btn-small" type="button">筛选</button>
+									</div>
+								</div>
+							</li>
+							<li>
+								<select class="select">
+									<option>详情</option>
+									<option>汇总</option>
+								</select>
+							</li>
+							<li>
+								<div class="search">
+									<div class="input-append">
+										<input class="span3" placeholder="单位" type="text" style="width:100px">
+										<button class="btn btn-small" type="button">搜索</button>
+									</div>
+								</div>
+							</li>
+							<li>
+								<a class="button" href="#download" data-toggle="modal">下载5月提成</a>
+							</li>
+		  				</ul>
+		  			</div>
+					<div class="saeaList">
+						<table class="table table-hover">
+							<tbody>
+							<tr class="thead"><th>产品类别</th><th>单位</th><th width="60">金额</th><th width="60">公关费</th><th width="60">计提金额</th><th width="60">刘飞</th><th width="60">姜栋</th><th width="60">冯娟</th><th width="60">何燿</th><th width="60">杨克松</th><th width="60">杨朱颖</th><th width="60">黄俊杰</th><th width="60">赖超锋</th><th width="60">张嘉伟</th><th width="60">严霜</th></tr>
+							<tr><td>纵横公路工程造价管理系统V9.0</td><td><a href="#detail" data-toggle="modal">广东XXXXX公司</a></td><td>20000.00</td><td>500.00</td><td>3900.00</td><td>1000.00</td><td>0</td><td>1000.00</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+							<tr><td>纵横公路工程造价管理系统V9.0</td><td><a href="#detail" data-toggle="modal">广东YYYYYY公司</a></td><td>20000.00</td><td>0</td><td>4000.00</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+							<tr><td>纵横公路工程造价管理系统V9.0</td><td><a href="#detail" data-toggle="modal">广东ZZZZZZ公司</a></td><td>20000.00</td><td>500</td><td>4000.00</td><td>0</td><td>0</td><td>2000.00</td><td>1000.00</td><td>1000.00</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+							<tr><td>培训班</td><td><a href="#detail2" data-toggle="modal">广东某某某培训班</a></td><td>80000.00</td><td>0</td><td>30000.00</td><td>1000.00</td><td>0</td><td>1000.00</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+							<!--培训班讲课费-->
+							<tr><td>讲课费</td><td><a href="#detail2" data-toggle="modal">广东某某某培训班</a></td><td>0.00</td><td></td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+							<tr><td colspan="2">合计</td><td>140000.00</td><td>500.00</td><td>42000.00</td><td>2000.00</td><td>0</td><td>3000.00</td><td>1000.00</td><td>1000.00</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+							</tbody>
+						</table>
+					</div>
+					<div class="demandPage">
+						<ul class="pagination fL">
+							<li><a href="#">&lt;</a></li>
+							<li><a href="#">1</a></li>
+							<li class="active"><a href="#">2</a></li>
+							<li><a href="#">3</a></li>
+							<li><a href="#">4</a></li>
+							<li><a href="#">5</a></li>
+							<li><a href="#">&gt;</a></li>
+						</ul>
+				  	</div>
+				  </div>
+			</div>
+		</div>
+	</div>
+	<!--弹出单位金额详情-->
+	<div class="modal hide fade" id="detail">
+		<div class="modal-dialog modal-lg">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>销售详情</h3>
+				</div>
+				<div class="modal-body saeaList" style="overflow:hidden;margin:0">
+					<div class="staff-detail-con">
+						<!--提成计算-->
+						<table class="table table-bordered table-condensed">
+							<tr><th class="taC" colspan="2">本次销售计提金额</th></tr>
+							<tr><th class="taC">计提计算方式</th><td>计提金额={销售金额-费用报销(公关费)}x20%</td></tr>
+							<tr><th class="taC">计提金额</th><td><b>3900</b>=(20000-500)*20%</td></tr>
+						</table>
+						<!--开票详情-->
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th colspan="4" class="taC">开票详情</th>
+							</tr>
+							<tr>
+								<th class="taC" width="150">开票流水号</th><td>#F20160316001</td>
+								<th class="taC" width="150">提交时间</th><td>2016-03-01 12:30:01</td>
+							</tr>
+							<th class="taC" width="150">所在办事处</th><td>广东办(刘飞)</td>
+							<th class="taC">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">发票备注</th><td colspan="3"></td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">数量</th><td><b>1</b></td>
+								<th class="taC">单价</th><td><b>¥20000.00</b></td>
+							</tr>
+							<tr>
+								<th class="taC">开票金额</th><td colspan="3"><b class="colOrange" style="font-size:18px">¥20000.00</b></td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">结算方式</th><td colspan="3">软件销售 <!-- 培训班(<a href="invoice-batch-detail.html" target="_blank">2018年4月18江西省公路工程造价高级应用培训-清单培训</a>) --></td>
+							</tr>
+							<tr>
+								<th colspan="4" class="taC">增值税专用发票</th>
+							</tr>
+							<tr>
+								<th class="taC" width="150">单位名称</th><td>珠海纵横创建软件有限公司</td>
+								<th class="taC" width="150">纳税人识别码</th><td>1212123123123</td>
+
+							</tr>
+
+							<tr>
+								<th class="taC">注册地址</th><td>广东省珠海市香洲区银桦路8号24D</td>
+								<th class="taC">注册电话</th><td>0756-34324</td>
+							</tr>
+							<tr>
+								<th class="taC">开户银行</th><td>广发银行</td>
+								<th class="taC">银行账号</th><td>234324234</td>
+							</tr>
+							</tbody>
+						</table>
+						<!--收款-->
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th class="taC" colspan="4">收款详情</th>
+							</tr>
+							<tr>
+								<th class="taC">收款流水号</th><td>#SK20160316001</td>
+								<th class="taC">录入收款</th><td>张少珊 2015-04-12 11:30:02</td>
+							</tr>
+							<tr>
+								<th class="taC">收款金额</th><td><b>¥200000.00</b></td>
+								<th class="taC">收款信息</th><td>陈宇</td>
+							</tr>
+							<tr>
+								<th class="taC">收款银行</th><td>广发银行珠海分行柠溪支行</td>
+								<th class="taC">银行到帐</th><td>2016-04-11</td>
+							</tr>
+							<tr>
+								<th class="taC">认领收款</th><td colspan="3">张少珊 转入 陈特 2015-04-12 11:30:02</td>
+							</tr>
+							<tr>
+								<th class="taC">发票入账</th><td colspan="3">张少珊 入账 2015-04-12 11:30:02</td>
+							</tr>
+							</tbody>
+						</table>
+						<!--与发票绑定的公关费-->
+						<table class="table table-bordered table-condensed">
+							<tr>
+								<th colspan="4" class="taC">与发票绑定费用</th>
+							</tr>
+							<tr>
+								<th class="taC">费用单号</th><td>#B1402130405002</td>
+								<th class="taC">提交人</th><td>广东办-刘飞</td>
+							</tr>
+							<tr>
+								<th class="taC">费用所在办事处</th><td>广东办</td>
+								<th class="taC"></th><td></td>
+							</tr>
+								<th class="taC">费用说明</th><td colspan="3">销售软件公关费</td>
+							</tr>
+							<tr>
+								<th class="taC">费用合计</th><td colspan="3"><b>500.00</b></td>
+							</tr>
+							<tr>
+								<th colspan="4" class="taC">费用明细</th>
+							</tr>
+							<tr>
+								<th class="taC">公关费</th><td>500.00</td>
+								<th class="taC"></th><td></td>
+							</tr>
+							<tr>
+						</table>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div>
+		</div>
+	</div>
+	<!--弹出下载数据-->
+	<div class="modal hide fade" id="download">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>下载5月提成数据</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<p><a href="#">CLD-5月广东办提成.xls</a></p>
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div>
+		</div>
+	</div>
+<script type="text/javascript">autoFlashHeight();</script>
+<script type="text/javascript">$('#need-data').modal('show2');
+</script>
+</body>

+ 16 - 10
staff-commission-org.html

@@ -9,6 +9,9 @@
 	<link rel=stylesheet href=css/global.css>
 	<script src=js/jquery-1.7.1.min.js></script>
 	<script src=js/global.js></script>
+	<link href="css/datepicker.min.css" rel="stylesheet" type="text/css">
+	<script src="js/datepicker.min.js"></script>
+	<script src="js/datepicker.zh.js"></script>
 </head>
 <body>
 	<div class="mainLayout">
@@ -62,6 +65,14 @@
 					<div class="demandCate">
 						<ul class="cateList">
 							<li>
+								<div class="search">
+									<div class="input-append">
+										<input class="datepicker-here span3" placeholder="选择月份" type="text" data-language="zh" data-min-view="months" data-view="months" style="width:100px">
+										<button class="btn btn-small" type="button">筛选</button>
+									</div>
+								</div>
+							</li>
+							<li>
 								<select class="select">
 									<option>所有</option>
 									<option>软件销售</option>
@@ -77,14 +88,6 @@
 								</select>
 							</li>
 							<li>
-								<select class="select">
-									<option>全部</option>
-									<option>实习</option>
-									<option>试用</option>
-									<option>正式</option>
-								</select>
-							</li>
-							<li>
 								<div class="search">
 									<div class="input-append">
 										<input class="span3" placeholder="单位" type="text" style="width:200px">
@@ -113,7 +116,7 @@
 							<tr><td>培训班</td><td><a href="#detail2" data-toggle="modal">广东某某某培训班</a></td><td>80000.00</td><td>0</td><td class="colRed">30000.00</td><td><a href="#dist" data-toggle="modal">分配</a></td><td>1000.00</td><td>0</td><td>1000.00</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
 							<!--培训班讲课费-->
 							<tr><td>讲课费</td><td><a href="#detail2" data-toggle="modal">广东某某某培训班</a></td><td>0.00</td><td></td><td></td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
-							<tr><td colspan="2">合计</td><td>140000.00</td><td>500.00</td><td class="colRed">42000.00</td><td><a href="#dist" data-toggle="modal">分配</a></td><td>2000.00</td><td>0</td><td>3000.00</td><td>1000.00</td><td>1000.00</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+							<tr><td colspan="2">合计</td><td>140000.00</td><td>500.00</td><td>42000.00</td><td></td><td>2000.00</td><td>0</td><td>3000.00</td><td>1000.00</td><td>1000.00</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
 							</tbody>
 						</table>
 					</div>
@@ -372,10 +375,13 @@
 					<h3>完成本月提成</h3>
 				</div>
 				<div class="modal-body saeaList">
+					<!--有未完成分配-->
+					<h4>有未分配的提成金额(“计提金额”为红色),需完成所有提成金额分配才能完成本月提成。</h4>
 					<h4>确认完成本月提成数据,完成后即可为工资提供数据;</h4>
-					<h4>提交完成后,不可再修改,请确认后再提交。</h4>
+					<h4>提交完成后,数据将锁定不可再修改,请确认后再提交。</h4>
 				</div>
 				<div class="modal-footer">
+					<!--未完成所有提成分配,不显示 确认完成-->
 					<a href="#" class="button">确认完成</a>
 					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 				</div>

+ 40 - 100
staff-commission.html

@@ -9,6 +9,9 @@
 	<link rel=stylesheet href=css/global.css>
 	<script src=js/jquery-1.7.1.min.js></script>
 	<script src=js/global.js></script>
+	<link href="css/datepicker.min.css" rel="stylesheet" type="text/css">
+	<script src="js/datepicker.min.js"></script>
+	<script src="js/datepicker.zh.js"></script>
 </head>
 <body>
 	<div class="mainLayout">
@@ -71,7 +74,7 @@
 							<li><span>总部-测试与技术支持部</span></li>
 							<li><span>总部-综合管理部</span></li>
 							<li><span>甘肃办</span></li>
-							<li><a href="#">广东办(点我)</a></li>
+							<li><a href="staff-commission-detail-org.html">广东办(点我)</a></li>
 							<li><span>内蒙办</span></li>
 							<li><span>浙江办</span></li>
 							<li><span>安徽办</span></li>
@@ -89,19 +92,12 @@
 					<div class="demandCate">
 						<ul class="cateList">
 							<li>
-								<select class="select">
-									<option>所有</option>
-									<option>总部</option>
-									<option>广东办</option>
-									<option>广西办</option>
-								</select>
-							</li>
-							<li>
-								<select class="select">
-									<option>显示有提成</option>
-									<option>显示无提成</option>
-									<option>所有</option>
-								</select>
+								<div class="search">
+									<div class="input-append">
+										<input class="datepicker-here span3" placeholder="选择月份" type="text" data-language="zh" data-min-view="months" data-view="months" style="width:100px">
+										<button class="btn btn-small" type="button">筛选</button>
+									</div>
+								</div>
 							</li>
 							<li>
 								<select class="select">
@@ -111,22 +107,6 @@
 								</select>
 							</li>
 							<li>
-								<select class="select">
-									<option>全部</option>
-									<option>实习</option>
-									<option>试用</option>
-									<option>正式</option>
-								</select>
-							</li>
-							<li>
-								<select class="select">
-									<option>所有岗位</option>
-									<option>开发员</option>
-									<option>销售助理</option>
-									<option>销售</option>
-								</select>
-							</li>
-							<li>
 								<div class="search">
 									<div class="input-append">
 										<input class="span3" placeholder="姓名、工号" type="text" style="width:100px">
@@ -142,6 +122,7 @@
 							</li>
 							<li>
 								<a class="button btn-gray">5月已完成</a>
+								<a class="button" href="#start" data-toggle="modal">开始6月提成</a>
 							</li>
 		  				</ul>
 		  			</div>
@@ -149,10 +130,10 @@
 						<table class="table table-hover">
 							<tbody>
 							<tr class="thead"><th width="80">工号</th><th>姓名</th><th>手机</th><th>聘用状态</th><th>办事处/部门</th><th>入职时间</th><th>离职时间</th><th>软件销售</th><th>培训班</th><th>讲课费</th><th>合计</th></tr>
-							<tr><td>Z0001</td><td><a href="#detail" data-toggle="modal">张三(点我)</a></td><td>12345678901</td><td>正式</td><td>重庆办</td><td>2017-05-30</td><td class="colRed"></td><td>2000</td><td>0</td><td>0</td><td>2000</td></tr>
-							<tr><td>Z0002</td><td><a href="#">王五</a></td><td>12345678901</td><td>实习</td><td>总部/研究中心</td><td>2017-05-30</td><td class="colRed"></td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
-							<tr class="warning"><td>Z0003</td><td><a href="#">李四</a></td><td>12345678901</td><td>试用</td><td>总部</td><td>2017-05-30</td><td class="colRed">2018-07-30</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
-							<tr><td>Z0004</td><td><a href="#">王五</a></td><td>12345678901</td><td>正式</td><td>总部</td><td>2017-05-30</td><td class="colRed">2018-07-30</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+							<tr><td>Z0001</td><td>张三</td><td>12345678901</td><td>正式</td><td>重庆办</td><td>2017-05-30</td><td class="colRed"></td><td>2000</td><td>0</td><td>0</td><td>2000</td></tr>
+							<tr><td>Z0002</td><td>王五</td><td>12345678901</td><td>实习</td><td>总部/研究中心</td><td>2017-05-30</td><td class="colRed"></td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+							<tr class="warning"><td>Z0003</td><td>李四</td><td>12345678901</td><td>试用</td><td>总部</td><td>2017-05-30</td><td class="colRed">2018-07-30</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+							<tr><td>Z0004</td><td>王五</td><td>12345678901</td><td>正式</td><td>总部</td><td>2017-05-30</td><td class="colRed">2018-07-30</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
 							</tbody>
 						</table>
 					</div>
@@ -171,101 +152,60 @@
 			</div>
 		</div>
 	</div>
-	<!--弹出提成调整-->
-	<div class="modal hide fade" id="detail">
-		<div class="modal-dialog modal-xlg">
+
+	<!--弹出下载数据-->
+	<div class="modal hide fade" id="download">
+		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
-					<h3>员工详情</h3>
+					<h3>下载5月提成数据</h3>
 				</div>
-				<div class="modal-body saeaList" style="overflow:hidden;margin:0">
-					<div class="fL staff-detail-con">
-						<table class="table table-bordered table-condensed">
-							<tbody>
-							<tr>
-								<th class="taC" width="150">工号</th><td width="210">Z0001</td>
-								<th class="taC" width="150">姓名</th><td><input type="text" value="张三" disabled></td>
-							</tr>
-							<tr>
-								<th class="taC" width="150">办事处/部门</th><td><select disabled><option>重庆</option><option>总部-研究中心</option><option>广东办</option></select></td>
-								<th class="taC" width="150">岗位</th><td><input type="text" value="销售" disabled></td>
-							</tr>
-							<tr>
-								<th class="taC" width="150">入职日期</th><td><input type="text" value="2017-01-01" disabled></td>
-								<th class="taC" width="150">离职日期</th><td><input type="text" value="" disabled></td>
-							</tr>
-							</tbody>
-						</table>
-						<table class="table table-bordered table-condensed">
-							<tr>
-								<th class="taC colGreen" colspan="2">收入</th>
-							</tr>
-							<tr>
-								<th class="taC" width="150">销售提成</th><td><input type="number" value="2000"></td>
-
-							</tr>
-						</table>
-					</div>
-					<div class="fL staff-detail-side">
-						<!--工资调整记录-->
-						<div class="infoFlowList">
-						 <div class="dateTitle">
-							 <em class="month"><span class="num">9</span><span class="text">-02</span></em>
-							 <span class="year">2013</span>
-						 </div>
-						 <ul class="flowList">
-							 <li class="item colGray">总部-温秀娟</li>
-							 <li class="item">岗位工资 由 3100 调至 6700</li>
-						 </ul>
-					 	</div>
-						<div class="infoFlowList">
-							 <div class="dateTitle">
-								 <em class="month"><span class="num">8</span><span class="text">-01</span></em>
-								 <span class="year">2013</span>
-							 </div>
-							 <ul class="flowList">
-								 <li class="item colGray">总部-温秀娟</li>
-								 <li class="item">基本工资 由 2000 调至 3000</li>
-							 </ul>
-						 	</div>
-					</div>
+				<div class="modal-body saeaList">
+					<p><a href="#">CLD-5月公司提成.xls</a></p>
 				</div>
 				<div class="modal-footer">
-					<a href="#" class="button">确定更新</a>
 					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 				</div>
 			</div>
 		</div>
 	</div>
-	<!--弹出下载数据-->
-	<div class="modal hide fade" id="download">
+	<!--弹出完成数据-->
+	<div class="modal hide fade" id="done">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
-					<h3>下载5月提成数据</h3>
+					<h3>完成本月提成</h3>
 				</div>
 				<div class="modal-body saeaList">
-					<p><a href="#">CLD-5月广东办提成.xls</a></p>
+						<table class="table table-sm table-bordered">
+							<tr><th class="taC">办事处</th><th class="taC" width="100">完成状态</th><th class="taC">办事处</th><th class="taC" width="100">完成状态</th></tr>
+							<tr><td>广东办</td><td><span class="colGray">待完成</span></td><td>广西办</td><td><span class="colGreen">已完成</span> <a href="#">解锁</a></td></tr>
+							<tr><td>重庆办</td><td><span class="colGray">待完成</span></td><td>内蒙办</td><td><span class="colGray">待完成</span></td></tr>
+							<tr><td>新疆办</td><td><span class="colGray">待完成</span></td><td>江西办</td><td><span class="colGray">待完成</span></td></tr>
+						</table>
+					<h4>所有办事处完成提成分配后,即可确认完成全公司的提成;</h4>
+					<h4>提交完成后,不可再修改,请确认后再提交。</h4>
 				</div>
 				<div class="modal-footer">
+					<!--所有办事处都已完成,才出现按钮--><!-- <a href="#" class="button">确认完成</a> -->
 					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 				</div>
 			</div>
 		</div>
 	</div>
-	<!--弹出完成数据-->
-	<div class="modal hide fade" id="done">
+	<!--弹出 开始6月提成-->
+	<div class="modal hide fade" id="start">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
-					<h3>完成本月提成</h3>
+					<h3>开始6月提成</h3>
 				</div>
 				<div class="modal-body saeaList">
-					<h4>确认完成本月提成数据,完成后即可为工资提供数据;</h4>
-					<h4>提交完成后,不可再修改,请确认后再提交。</h4>
+					<h4 class="colRed">确认开始新提成,上一个月的提成数据将彻底锁定,不可修改;</h4>
+					<h4 class="colRed">请谨慎确认再操作。</h4>
 				</div>
 				<div class="modal-footer">
-					<a href="#" class="button">确认成</a>
+					<a href="#" class="button">确认开始6月提成</a>
 					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 				</div>
 			</div>