Przeglądaj źródła

Merge branch 'master' of http://192.168.1.12:3000/s.h.i.e.l.d./cld1.3

Chente 7 lat temu
rodzic
commit
1454c19527

+ 1 - 0
admin-reportGroup-carriedout.html

@@ -40,6 +40,7 @@
 						<li><a href="admin-reportGroup-role.html">审批角色</a></li>
 						<li><a href="admin-reportGroup-role.html">审批角色</a></li>
 						<li class="active"><a href="">费用执行人</a></li>
 						<li class="active"><a href="">费用执行人</a></li>
 						<li><a href="admin-reportGroup-collect.html">汇总权限</a></li>
 						<li><a href="admin-reportGroup-collect.html">汇总权限</a></li>
+						<li><a href="admin-reportGroup-payments.html">日常收支权限</a></li>
 					</ul>
 					</ul>
 				</div>
 				</div>
 					<legend>编辑执行人</legend><form method="post" action="/addCategory" name="group">
 					<legend>编辑执行人</legend><form method="post" action="/addCategory" name="group">

+ 1 - 0
admin-reportGroup-collect.html

@@ -40,6 +40,7 @@
 						<li><a href="">审批角色</a></li>
 						<li><a href="">审批角色</a></li>
 						<li><a href="admin-reportGroup-carriedout.html">费用执行人</a></li>
 						<li><a href="admin-reportGroup-carriedout.html">费用执行人</a></li>
 						<li class="active"><a href="">汇总权限</a></li>
 						<li class="active"><a href="">汇总权限</a></li>
+						<li><a href="admin-reportGroup-payments.html">日常收支权限</a></li>
 					</ul>
 					</ul>
 				</div>
 				</div>
 				<form>
 				<form>

+ 225 - 0
admin-reportGroup-payments.html

@@ -0,0 +1,225 @@
+<!DOCTYPE html>
+<html lang=zh-cn> 
+<head>
+	<meta charset=utf-8> 
+	<title>CLD.System</title> 
+	<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="后台管理"><a href="#" class="icon-  selected">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><a href="admin-admininfo.html">管理员设置</a></li>
+						<li><a href="admin-group.html">办事处</a></li>
+						<li><a href="admin-user.html">员工列表</a></li>
+						<li><a href="admin-product.html">产品列表</a></li>
+						<li><a href="admin-reportGroup.html" class="selected">报销审查组</a></li>
+						<li><a href="admin-demand.html">需求中心</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<div class="subNav">
+					<ul class="navTabs">
+						<li><a href="admin-reportGroup.html">审批组</a></li>
+						<li><a href="">审批角色</a></li>
+						<li><a href="admin-reportGroup-carriedout.html">费用执行人</a></li>
+						<li><a href="admin-reportGroup-collect.html">汇总权限</a></li>
+						<li class="active"><a href="admin-reportGroup-payments.html">日常收支权限</a></li>
+					</ul>
+				</div>
+				<form>
+					<legend>添加汇总权限</legend>
+						<table class="table table-striped">
+              <thead>
+                <tr>
+                  <th>可见</th>
+                  <th>操作</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td>范月光<a href="#del" data-toggle="modal" role="button" title="删除" class="icon-">k</a>、谭玉堂<a href="#del" data-toggle="modal" role="button" title="删除" class="icon-">k</a></td>
+                  <td><a href="#add" data-toggle="modal">添加</a></td>
+                </tr>
+              </tbody>
+          	</table>
+					</form>
+			</div>
+		</div>
+	</div>
+<!--弹出(添加可见人)-->
+<div class="modal hide fade" id="add">
+
+  <div class="modal-dialog">
+    <div class="modal-content">
+    <div class="modal-header">
+    <h3>添加可见人</h3>
+    </div>
+    <div class="modal-body">
+    	<div class="control-group">
+				<label class="control-label">成员</label>
+				<div class="controls">
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="1:admin:/global/img/avtra">admin			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="2:陈帅:/global/avatar/avatar_2">陈帅			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="3:范月光:/global/avatar/avatar_3">范月光			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="4:王涛:/global/avatar/avatar_4">王涛			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="5:苟彦刚:/global/avatar/avatar_5">苟彦刚			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="6:刘飞:/global/avatar/avatar_6">刘飞			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="7:王洪生:/global/avatar/avatar_7">王洪生			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="8:姜栋:/global/avatar/avatar_8">姜栋			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="9:刘庆:/global/avatar/avatar_9">刘庆			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="10:黄巾桃:/global/avatar/avatar_10">黄巾桃			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="11:祝海宾:/global/avatar/avatar_11">祝海宾			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="12:王文鹏:/global/avatar/avatar_12">王文鹏			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="13:周江红:/global/avatar/avatar_13">周江红			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="14:王智:/global/avatar/avatar_14">王智			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="15:全冰:/global/avatar/avatar_15">全冰			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="16:wq:/global/img/avtra">wq			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="17:lfm:/global/img/avtra">lfm			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="18:王星植:/global/avatar/avatar_18">王星植			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="19:张文远:/global/avatar/avatar_19">张文远			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="20:赵君红:/global/avatar/avatar_20">赵君红			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="21:李清学:/global/avatar/avatar_21">李清学			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="22:孙燕娇:/global/avatar/avatar_22">孙燕娇			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="23:张晓娟:/global/avatar/avatar_23">张晓娟			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="24:杨卫东:/global/avatar/avatar_24">杨卫东			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="28:林森:/global/avatar/avatar_28">林森			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="29:周洪波:/global/avatar/avatar_29">周洪波			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="30:谭玉堂:/global/avatar/avatar_30">谭玉堂			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="31:何银龄:/global/avatar/avatar_31">何银龄			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="32:张引:/global/avatar/avatar_32">张引			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="33:杨福芳:/global/avatar/avatar_33">杨福芳			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="34:赵淑燕:/global/avatar/avatar_34">赵淑燕			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="35:陈世龙:/global/avatar/avatar_35">陈世龙			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="36:冷淑梅:/global/avatar/avatar_36">冷淑梅			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="37:麦心蓉:/global/avatar/avatar_37">麦心蓉			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="51:陈叶婷:/global/avatar/avatar_51">陈叶婷			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="39:陈特:/global/avatar/avatar_39">陈特			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="40:任杰:/global/avatar/avatar_40">任杰			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="41:蔡频:/global/avatar/avatar_41">蔡频			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="42:王晶:/global/avatar/avatar_42">王晶			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="43:张少珊:/global/avatar/avatar_43">张少珊			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="44:黄爱玲:/global/avatar/avatar_44">黄爱玲			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="45:欧汝:/global/avatar/avatar_45">欧汝			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="46:付青青:/global/avatar/avatar_46">付青青			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="52:舒媚:/global/avatar/avatar_52">舒媚			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="38:王丰:/global/avatar/avatar_38">王丰			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="54:lmh:/global/avatar/avatar_54">lmh			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="55:李凯:/global/avatar/avatar_55">李凯			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="58:田洪武:/global/avatar/avatar_58">田洪武			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="59:刘婷:/global/avatar/avatar_59">刘婷			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="60:冯娟:/global/avatar/avatar_60">冯娟			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="61:罗颖:/global/avatar/avatar_61">罗颖			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="62:zss:/global/img/avtra">zss			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="63:余婷:/global/avatar/avatar_63">余婷			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="64:何耀:/global/avatar/avatar_64">何耀			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="65:杨克松:/global/avatar/avatar_65">杨克松			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="68:张欣:/global/avatar/avatar_68">张欣			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="69:李建霞:/global/avatar/avatar_69">李建霞			               </label>
+					<label style="display:inline">
+						<input type="checkbox" name="staff[]" value="71:杨孟雅:/global/avatar/avatar_71">杨孟雅			               </label>
+				</div>
+			</div>
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	    <a href="#" class="button" data-dismiss="modal" aria-hidden="true">确定</a>
+	</div>
+</div>
+</div>
+</div>
+<!--弹出-->
+<!--弹出(删除可见人)-->
+<div class="modal hide fade" id="del">
+
+  <div class="modal-dialog">
+    <div class="modal-content">
+    <div class="modal-header">
+    <h3>确认删除</h3>
+    </div>
+    <div class="modal-body">
+    	<p>删除后,该用户将不能看到办事处汇总页</p>
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	    <a href="#" class="button" data-dismiss="modal" aria-hidden="true">确定</a>
+	</div>
+</div>
+</div>
+</div>
+<!--弹出-->
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

+ 1 - 0
admin-reportGroup-role.html

@@ -40,6 +40,7 @@
 						<li class="active"><a href="">审批角色</a></li>
 						<li class="active"><a href="">审批角色</a></li>
 						<li><a href="admin-reportGroup-carriedout.html">费用执行人</a></li>
 						<li><a href="admin-reportGroup-carriedout.html">费用执行人</a></li>
 						<li><a href="admin-reportGroup-collect.html">汇总权限</a></li>
 						<li><a href="admin-reportGroup-collect.html">汇总权限</a></li>
+						<li><a href="admin-reportGroup-payments.html">日常收支权限</a></li>
 					</ul>
 					</ul>
 				</div>
 				</div>
 					<form>
 					<form>

+ 1 - 0
admin-reportGroup.html

@@ -40,6 +40,7 @@
 						<li><a href="admin-reportGroup-role.html">审批角色</a></li>
 						<li><a href="admin-reportGroup-role.html">审批角色</a></li>
 						<li><a href="admin-reportGroup-carriedout.html">费用执行人</a></li>
 						<li><a href="admin-reportGroup-carriedout.html">费用执行人</a></li>
 						<li><a href="admin-reportGroup-collect.html">汇总权限</a></li>
 						<li><a href="admin-reportGroup-collect.html">汇总权限</a></li>
+						<li><a href="admin-reportGroup-payments.html">日常收支权限</a></li>
 					</ul>
 					</ul>
 				</div>
 				</div>
 					<form>
 					<form>

+ 9 - 4
invoice-dlist-receivables.html

@@ -63,6 +63,11 @@
 						<li><select><option>办事处</option><option>广东办</option></select>&nbsp;<select><option>员工</option></select></li>
 						<li><select><option>办事处</option><option>广东办</option></select>&nbsp;<select><option>员工</option></select></li>
 						<li><select><option>2017</option></select>&nbsp;<select><option>全年</option><option>1月</option></select></li>
 						<li><select><option>2017</option></select>&nbsp;<select><option>全年</option><option>1月</option></select></li>
 						<li><select style="width:150px;"><option>所有开票内容</option></select></li>
 						<li><select style="width:150px;"><option>所有开票内容</option></select></li>
+						<li><div class="search"><div class="input-append">
+									<input class="span3" placeholder="开票单位、发票号" type="text">
+									<button class="btn btn-small" type="button">搜索</button>
+								</div>
+						</div></li>
 						<li>开票数量:<b>150</b> 张</li>
 						<li>开票数量:<b>150</b> 张</li>
 						<li>开票总计:¥9000.00</li>
 						<li>开票总计:¥9000.00</li>
 						<li>应收款总计:<span class="colGreen">¥7000.00</span></li>
 						<li>应收款总计:<span class="colGreen">¥7000.00</span></li>
@@ -76,12 +81,12 @@
 					});</script>
 					});</script>
 					<table class="table table-bordered table-condensed table-hover fancyTable" id="invoiceTable">
 					<table class="table table-bordered table-condensed table-hover fancyTable" id="invoiceTable">
 						<thead>
 						<thead>
-							<tr><th class="taC">开票流水号</th><th class="taC">开票金额</th><th class="taC">开票单位(抬头)</th><th class="taC">开票内容</th><th class="taC">收款流水号</th><th class="taC">收款金额</th><th class="taC">应收款金额</th><th class="taC">申请人</th><th class="taC">出票时间</th></tr>
+							<tr><th class="taC">开票流水号</th><th class="taC">开票金额</th><th class="taC">开票单位(抬头)</th><th class="taC">开票内容</th><th class="taC">发票号</th><th class="taC">收款流水号</th><th class="taC">收款金额</th><th class="taC">应收款金额</th><th class="taC">申请人</th><th class="taC">出票时间</th></tr>
 						</thead>
 						</thead>
 						<tbody>
 						<tbody>
-							<tr><td><a href="#">#F20160316001</a></td><td>¥3000.00</td><td>中交第二公路工程局有限公司</td><td>纵横公路工程造价管理系统V9.0</td><td><a href="#" data-toggle="modal">#SK20160316001</a></td><td>¥3000.00</td><td>¥3000.00</td><td>广东办-刘飞</td><td>2017-06-12 11:30:02</td></tr>
-							<tr><td><a href="#">#F20160316001</a></td><td>¥3000.00</td><td>中交第二公路工程局有限公司</td><td>纵横公路工程造价管理系统V9.0</td><td><a href="#" data-toggle="modal">#SK20160316001</a>,<a href="#billing" node-invoice="INFO" data-type="receivables" data-iskey="FXXJq" data-toggle="modal">#SK201805105223</a></td><td>¥2000.00</td><td>¥1000.00</td><td>总部-欧桃珍</td><td>2017-05-12 11:30:02</td></tr>
-							<tr><td><a href="#">#F20160316001</a></td><td>¥3000.00</td><td>中交第二公路工程局有限公司</td><td>纵横公路工程造价管理系统V9.0</td><td></td><td></td><td>¥3000.00</td><td>广东办-刘飞</td><td>2017-04-12 11:30:02</td></tr>
+							<tr><td><a href="#">#F20160316001</a></td><td>¥3000.00</td><td>中交第二公路工程局有限公司</td><td>纵横公路工程造价管理系统V9.0</td><td>06910408</td><td><a href="#" data-toggle="modal">#SK20160316001</a></td><td>¥3000.00</td><td>¥3000.00</td><td>广东办-刘飞</td><td>2017-06-12 11:30:02</td></tr>
+							<tr><td><a href="#">#F20160316001</a></td><td>¥3000.00</td><td>中交第二公路工程局有限公司</td><td>纵横公路工程造价管理系统V9.0</td><td>06910408</td><td><a href="#" data-toggle="modal">#SK20160316001</a>,<a href="#billing" node-invoice="INFO" data-type="receivables" data-iskey="FXXJq" data-toggle="modal">#SK201805105223</a></td><td>¥2000.00</td><td>¥1000.00</td><td>总部-欧桃珍</td><td>2017-05-12 11:30:02</td></tr>
+							<tr><td><a href="#">#F20160316001</a></td><td>¥3000.00</td><td>中交第二公路工程局有限公司</td><td>纵横公路工程造价管理系统V9.0</td><td>06910408</td><td></td><td></td><td>¥3000.00</td><td>广东办-刘飞</td><td>2017-04-12 11:30:02</td></tr>
 						</tbody>
 						</tbody>
 					</table>
 					</table>
 				</div>
 				</div>

+ 71 - 0
saea-bank-expenses-all.html

@@ -58,6 +58,12 @@
 					<ul class="cateList">
 					<ul class="cateList">
 	  					<li><a href="saea-bank-expenses-all.html" class="now">所有支出</a><a href="saea-bank-income-all.html">所有收入</a></li>
 	  					<li><a href="saea-bank-expenses-all.html" class="now">所有支出</a><a href="saea-bank-income-all.html">所有收入</a></li>
 	  					<li>
 	  					<li>
+	  						<select><option>所有办事处</option><option>广东办</option><option>总部</option><option>内蒙办</option></select>
+	  					</li>
+	  					<li>
+	  						<select><option>所有</option><option>费用管理</option><option>日常支出</option></select>
+	  					</li>
+	  					<li>
 							<div class="search">
 							<div class="search">
 								<div class="input-append">
 								<div class="input-append">
 									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"
 									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"
@@ -82,6 +88,71 @@
 	  				</table>
 	  				</table>
 	  			</div>
 	  			</div>
 	  		</div>
 	  		</div>
+	  		<div class="demandCate">
+					<ul class="cateList">
+	  					<li><a href="saea-bank-expenses-all.html" class="now">所有支出</a><a href="saea-bank-income-all.html">所有收入</a></li>
+	  					<li>
+	  						<select><option>所有办事处</option><option>广东办</option><option>总部</option><option>内蒙办</option></select>
+	  					</li>
+	  					<li>
+	  						<select><option>所有</option><option selected>费用管理</option><option>日常支出</option></select>
+	  						<select><option>所有</option><option>报销</option><option>借款</option><option>对公汇款</option></select>
+	  					</li>
+	  					<li>
+							<div class="search">
+								<div class="input-append">
+									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"
+							    data-multiple-dates-separator=" - "
+							    data-language="zh">
+									<button class="btn btn-small" type="button">查询</button>
+								</div>
+							</div></li>
+	  					<li>合计:¥1287.00</li>
+	  			</ul>
+	  		</div>
+	  		<div class="saeaList">
+	  			<!--执行列表-->
+	  			<div class="">
+	  				<table class="table table-bordered table-condensed">
+	  					<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>¥3000.00</td><td>纵横广发</td><td>2018-11-11</td><td><a href="#saea-detail2" data-toggle="modal">#B2019873649(点我)</a></td><td>广东办-刘飞</td></tr>
+	  					<tr><td>费用管理(借款)</td><td>¥2000.00</td><td>个人广发</td><td>2018-11-11</td><td><a href="#saea-detail2" data-toggle="modal">#B2019873649(点我)</a></td><td>广东办-刘飞</td></tr>
+	  					<tr><td>费用管理(借款报销)</td><td>¥2000.00</td><td>华润银行</td><td>2018-11-11</td><td><a href="#saea-detail2" data-toggle="modal">#B2019873649(点我)</a></td><td>广东办-刘飞</td></tr>
+	  					<tr><td>费用管理(对公汇款)</td><td>¥2000.00</td><td>纵横广发</td><td>2018-11-11</td><td><a href="#saea-detail2" data-toggle="modal">#B2019873649</a></td><td>广东办-刘飞</td></tr>
+	  				</table>
+	  			</div>
+	  		</div>
+	  		<div class="demandCate">
+					<ul class="cateList">
+	  					<li><a href="saea-bank-expenses-all.html" class="now">所有支出</a><a href="saea-bank-income-all.html">所有收入</a></li>
+	  					<li>
+	  						<select><option>所有办事处</option><option>广东办</option><option>总部</option><option>内蒙办</option></select>
+	  					</li>
+	  					<li>
+	  						<select><option>所有</option><option>费用管理</option><option selected>日常支出</option></select>
+	  						<select><option>所有</option><option>银行手续费</option><option>总部电话费</option><option>缴税</option><option>广发理财</option><option>工行理财</option><option>保证经</option></select>
+	  					</li>
+	  					<li>
+							<div class="search">
+								<div class="input-append">
+									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"
+							    data-multiple-dates-separator=" - "
+							    data-language="zh">
+									<button class="btn btn-small" type="button">查询</button>
+								</div>
+							</div></li>
+	  					<li>合计:¥1287.00</li>
+	  			</ul>
+	  		</div>
+	  		<div class="saeaList">
+	  			<!--执行列表-->
+	  			<div class="">
+	  				<table class="table table-bordered table-condensed">
+	  					<tr><td>日常支出(银行手续费)</td><td>¥2000.00</td><td>纵横广发</td><td>2018-11-11</td><td><a href="#saea-detail2" data-toggle="modal">#J2019873649(点我)</a></td><td>总部-黄嘉玲</td></tr>
+	  					<tr><td>日常支出(总部电话费)</td><td>¥2000.00</td><td>纵横广发</td><td>2018-11-11</td><td><a href="#saea-detail2" data-toggle="modal">#J2019873649(点我)</a></td><td>总部-黄嘉玲</td></tr>
+	  				</table>
+	  			</div>
+	  		</div>
 			</div>
 			</div>
 		</div>
 		</div>
 	</div>
 	</div>

+ 70 - 1
saea-bank-income-all.html

@@ -58,6 +58,12 @@
 					<ul class="cateList">
 					<ul class="cateList">
 	  					<li><a href="saea-bank-expenses-all.html">所有支出</a><a href="saea-bank-income-all.html" class="now">所有收入</a></li>
 	  					<li><a href="saea-bank-expenses-all.html">所有支出</a><a href="saea-bank-income-all.html" class="now">所有收入</a></li>
 	  					<li>
 	  					<li>
+	  						<select><option>所有办事处</option><option>广东办</option><option>总部</option><option>内蒙办</option></select>
+	  					</li>
+	  					<li>
+	  						<select><option>所有</option><option>发票收款</option><option>日常收入</option></select>
+	  					</li>
+	  					<li>
 							<div class="search">
 							<div class="search">
 								<div class="input-append">
 								<div class="input-append">
 									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"
 									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"
@@ -74,11 +80,74 @@
 	  			<div class="entry">
 	  			<div class="entry">
 	  				<table class="table table-bordered table-condensed">
 	  				<table class="table table-bordered table-condensed">
 	  					<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 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>¥3000.00</td><td>纵横广发</td><td>2018-11-11</td><td><a href="#saea-detail2" data-toggle="modal">#N2019873649</a></td><td>总部-黄嘉玲</td></tr>
+	  					<tr><td>发票收款</td><td>¥3000.00</td><td>纵横广发</td><td>2018-11-11</td><td><a href="#saea-detail2" data-toggle="modal">#SK201902146525</a></td><td>总部-黄嘉玲</td></tr>
 	  					<tr><td>日常收入(利息收入)</td><td>¥2000.00</td><td>个人广发</td><td>2018-11-11</td><td><a href="#saea-detail2" data-toggle="modal">#N2019873649</a></td><td>总部-黄嘉玲</td></tr>
 	  					<tr><td>日常收入(利息收入)</td><td>¥2000.00</td><td>个人广发</td><td>2018-11-11</td><td><a href="#saea-detail2" data-toggle="modal">#N2019873649</a></td><td>总部-黄嘉玲</td></tr>
 	  				</table>
 	  				</table>
 	  			</div>
 	  			</div>
 	  		</div>
 	  		</div>
+	  		<div class="demandCate">
+					<ul class="cateList">
+	  					<li><a href="saea-bank-expenses-all.html">所有支出</a><a href="saea-bank-income-all.html" class="now">所有收入</a></li>
+	  					<li>
+	  						<select><option>所有办事处</option><option>广东办</option><option>总部</option><option>内蒙办</option></select>
+	  					</li>
+	  					<li>
+	  						<select><option>所有</option><option selected>发票收款</option><option>日常收入</option></select>
+	  					</li>
+	  					<li>
+							<div class="search">
+								<div class="input-append">
+									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"
+							    data-multiple-dates-separator=" - "
+							    data-language="zh">
+									<button class="btn btn-small" type="button">查询</button>
+								</div>
+							</div></li>
+	  					<li>合计:¥1287.00</li>
+	  			</ul>
+	  		</div>
+	  		<div class="saeaList">
+	  			<!--执行列表-->
+	  			<div class="">
+	  				<table class="table table-bordered table-condensed">
+	  					<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></tr>
+	  					<tr><td>发票收款</td><td>广东办</td><td>珠海纵横创新软件有限公司</td><td>¥3000.00</td><td>纵横广发</td><td>2018-11-11</td><td><a href="#saea-detail2" data-toggle="modal">#SK201902146525</a></td><td>总部-黄嘉玲</td></tr>
+	  					<tr><td>发票收款</td><td>总部</td><td>中交第二公路工程局有限公司</td><td>¥3000.00</td><td>纵横广发</td><td>2018-11-11</td><td><a href="#saea-detail2" data-toggle="modal">#SK201902146525</a></td><td>总部-黄嘉玲</td></tr>
+	  				</table>
+	  			</div>
+	  		</div>
+	  		<div class="demandCate">
+					<ul class="cateList">
+	  					<li><a href="saea-bank-expenses-all.html">所有支出</a><a href="saea-bank-income-all.html" class="now">所有收入</a></li>
+	  					<li>
+	  						<select><option>所有办事处</option><option>广东办</option><option>总部</option><option>内蒙办</option></select>
+	  					</li>
+	  					<li>
+	  						<select><option>所有</option><option>发票收款</option><option selected>日常收入</option></select>
+	  						<select><option>所有</option><option selected>利息收入</option><option>补贴收入</option><option>纵横知道</option><option>借款收回</option><option>退回</option><option>其他</option><option>广发理财</option><option>工行理财</option><option>保证金</option></select>
+	  					</li>
+	  					<li>
+							<div class="search">
+								<div class="input-append">
+									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"
+							    data-multiple-dates-separator=" - "
+							    data-language="zh">
+									<button class="btn btn-small" type="button">查询</button>
+								</div>
+							</div></li>
+	  					<li>合计:¥1287.00</li>
+	  			</ul>
+	  		</div>
+	  		<div class="saeaList">
+	  			<!--执行列表-->
+	  			<div class="">
+	  				<table class="table table-bordered table-condensed">
+	  					<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>¥3000.00</td><td>纵横广发</td><td>2018-11-11</td><td><a href="#saea-detail2" data-toggle="modal">#SK201902146525</a></td><td>总部-黄嘉玲</td></tr>
+	  					<tr><td>日常收入(补贴收入)</td><td>¥3000.00</td><td>纵横广发</td><td>2018-11-11</td><td><a href="#saea-detail2" data-toggle="modal">#SK201902146525</a></td><td>总部-黄嘉玲</td></tr>
+	  				</table>
+	  			</div>
+	  		</div>
 			</div>
 			</div>
 		</div>
 		</div>
 	</div>
 	</div>

+ 49 - 0
saea-income-all.html

@@ -144,6 +144,17 @@
 								<td><a href="#editincome" data-toggle="modal">编辑(点我)</a> <a href="#delincome" data-toggle="modal">删除</a></td>
 								<td><a href="#editincome" data-toggle="modal">编辑(点我)</a> <a href="#delincome" data-toggle="modal">删除</a></td>
 							</tr>
 							</tr>
 							<tr>
 							<tr>
+								<th>收入</th>
+								<td>其他</td>
+								<td><a href="#">#IN201807061287</a></td>
+								<td class="taR">¥20000.00</td>
+								<td>纵横广发</td>
+								<td>2018-07-06</td>
+								<td>2018-07-06 13:00:11</td>
+								<td>备注内容</td>
+								<td><a href="#editincome" data-toggle="modal">编辑</a> <a href="#delincome" data-toggle="modal">删除</a> <a href="#refundincome" data-toggle="modal">退款(点我)</a></td>
+							</tr>
+							<tr>
 								<th><span class="colRed">支出</span></th>
 								<th><span class="colRed">支出</span></th>
 								<td>银行手续费</td>
 								<td>银行手续费</td>
 								<td><a href="#">#IN201807061287</a></td>
 								<td><a href="#">#IN201807061287</a></td>
@@ -259,6 +270,44 @@
 				</div>
 				</div>
 			</div></div>
 			</div></div>
 	</div>	
 	</div>	
+<!--弹出(退款)-->
+<div class="modal hide fade" id="refundincome">
+		<div class="modal-dialog ">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>填写退款信息</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th colspan="2" class="taC">退款信息</th>
+						</tr>
+						<tr>
+							<th class="taC">退款单位名称</th>
+							<td><input type="text" name="refundCompany" id="refundCompany" placeholder="请输入单位名称" aria-required="true" aria-invalid="true"></td>
+						</tr>
+						<tr>
+							<th class="taC">退款的账号</th>
+							<td><input type="text" name="refundNumber" id="refundNumber" placeholder="请输入账号" aria-required="true" aria-invalid="true"></td>
+						</tr>
+						<tr>
+							<th class="taC">退款金额</th>
+							<td><input type="text" name="refundPrice" id="refundPrice" placeholder="请输入退款金额" aria-required="true" aria-invalid="true"></td>
+						</tr>
+						<tr>
+							<th class="taC">备注</th>
+							<td><textarea name="refundRemarks" style="width:390px"></textarea></td>
+						</tr>
+						</tbody>
+					</table>
+				</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>
 <script type="text/javascript">autoFlashHeight();</script>
 
 
 </body>
 </body>

+ 2 - 1
saea-income.html

@@ -166,7 +166,8 @@
 							<p>
 							<p>
 							<!--利息收入 二级-->
 							<!--利息收入 二级-->
 							<label class="radio inline"><input type="radio">银行存款</label>
 							<label class="radio inline"><input type="radio">银行存款</label>
-							<label class="radio inline"><input type="radio">理财收益</label>
+							<label class="radio inline"><input type="radio">活期理财收益</label>
+							<label class="radio inline"><input type="radio">固定理财收益</label>
 							<label class="radio inline"><input type="radio">个人借款</label>
 							<label class="radio inline"><input type="radio">个人借款</label>
 							<!--补贴收入 二级-->
 							<!--补贴收入 二级-->
 							<!-- <label class="radio inline"><input type="radio">社保</label>
 							<!-- <label class="radio inline"><input type="radio">社保</label>

+ 3 - 0
staff-home.html

@@ -385,6 +385,9 @@
 							<tr>
 							<tr>
 								<th class="taC" width="150">离职原因</th><td>离职原因</td>
 								<th class="taC" width="150">离职原因</th><td>离职原因</td>
 							</tr>
 							</tr>
+							<tr>
+								<th class="taC" width="150">离职时间</th><td>2018-06-01</td>
+							</tr>
 						</tbody>
 						</tbody>
 					</table>
 					</table>
 					</div>
 					</div>