فهرست منبع

增加提成管理,移除福利设置

Chente 8 سال پیش
والد
کامیت
fa9911682f
8فایلهای تغییر یافته به همراه271 افزوده شده و 11 حذف شده
  1. 11 4
      staff-affixation.html
  2. 18 2
      staff-attendance.html
  3. 242 0
      staff-commission.html
  4. 0 1
      staff-employee.html
  5. 0 1
      staff-home.html
  6. 0 1
      staff-insurance.html
  7. 0 1
      staff-payroll.html
  8. 0 1
      staff-set-approval.html

+ 11 - 4
staff-affixation.html

@@ -48,7 +48,6 @@
 						<li><a href="staff-affixation.html" class="selected">附加收支项</a></li>
 						<li class="topLine"><a href="staff-set-payroll.html">工资设置</a></li>
 						<li><a href="staff-set-insurance.html">社保设置</a></li>
-						<li><a href="staff-input-set-welfare.html">福利设置</a></li>
 						<li><a href="staff-srt-commission.html">提成设置</a></li>
 						<li><a href="staff-set-approval.html">审批流程设置</a></li>
 					</ul>
@@ -97,8 +96,10 @@
 							<tr class="thead"><th width="100">编号</th><th>收支项名称</th><th>收支</th><th width="100">金额</th><th width="200">分期</th><th width="100">已发放期</th><th>绑定员工</th><th width="100">已发放金额</th><th>备注</th><th>添加日期</th><th>状态</th><th width="80">操作</th></tr>
 							<tr><td>#2018060797</td><td>电脑补助</td><td>员工收入</td><td>¥5412.00</td><td><a  href="#plane" data-toggle="modal">≈¥451.00/12期(点我)</a></td><td>1</td><td>总部-张三</td><td>¥451.00</td><td></td><td>2018-06-07</td><td class="colOrange">进行中</td><td></td></tr>
 							<tr><td>#2018060811</td><td>电脑补助</td><td>员工收入</td><td>¥5412.00</td><td><a href="#">≈¥903.50/6期</a></td><td>0</td><td></td><td>¥0.00</td><td></td><td>2018-06-08</td><td>未开始</td><td><a href="#edit" data-toggle="modal">编辑</a>&nbsp;<a href="#del" data-toggle="modal" class="colRed">删除</a></td></tr>
-							<tr><td>#2018060123</td><td>款</td><td class="colRed">员工支出</td><td>¥200000.00</td><td><a href="#">≈¥8333.33/24期</a></td><td>1</td><td>总部-张三</td><td>¥8334.00</td><td></td><td>2018-06-07</td><td class="colOrange">进行中</td><td></td></tr>
+							<tr><td>#2018060123</td><td>款</td><td class="colRed">员工支出</td><td>¥200000.00</td><td><a href="#">≈¥8333.33/24期</a></td><td>1</td><td>总部-张三</td><td>¥8334.00</td><td></td><td>2018-06-07</td><td class="colOrange">进行中</td><td></td></tr>
 							<tr><td>#2018060797</td><td>电脑补助</td><td>员工收入</td><td>¥5412.00</td><td><a href="#">≈¥451.00/12期</a></td><td>12</td><td>总部-张三</td><td>¥5412.00</td><td></td><td>2018-06-07</td><td class="colGreen">完成</td><td></td></tr>
+							<!--绑定了员工 还没开始发放-->
+							<tr><td>#2018060797</td><td>电脑补助</td><td>员工收入</td><td>¥5412.00</td><td><a href="#">≈¥451.00/12期</a></td><td>0</td><td>总部-张三</td><td>¥0.00</td><td></td><td>2018-06-07</td><td class="">定时 2018-09</td><td><a href="#edit" data-toggle="modal">编辑</a>&nbsp;<a href="#del" data-toggle="modal" class="colRed">删除</a></td></tr>
 						</tbody>
 					</table>
 				</div>
@@ -151,8 +152,14 @@
 				<div class="modal-body saeaList">
 					<table class="table table-bordered table-condensed">
 						<tbody>
-							<tr><th class="taC">收支</th><td>#2018060811</td></tr>
-							<tr><th class="taC">收支</th><td>员工收入</td></tr>
+							<tr><th class="taC" width="150">绑定员工</th><td><select><option>办事处</option></select><select><option>员工</option></select> <a href="#">解除绑定</a></tr>
+							<tr><th class="taC">定时发放</th><td><label class="radio inline"><input type="radio">本月发放</label> <label class="radio inline"><input type="radio">定时发放</label> <p><input type="month" ></p></td></tr>
+						</tbody>
+					</table>
+					<table class="table table-bordered table-condensed">
+						<tbody>
+							<tr><th class="taC" width="150">收支</th><td>#2018060811</td></tr>
+							<tr><th class="taC">收支</th><td><select><option>员工收入</option><option>员工指出</option></select></td></tr>
 							<tr><th class="taC">收支项名称</th><td><input type="text" value="电脑补助"></td></tr>
 							<tr><th class="taC">金额</th><td><input type="number" value="903.50"></td></tr>
 							<tr><th class="taC">分期</th><td><input type="number" step="1" min="1" value="6"></td></tr>

+ 18 - 2
staff-attendance.html

@@ -48,7 +48,6 @@
 						<li><a href="staff-affixation.html">附加收支项</a></li>
 						<li class="topLine"><a href="staff-set-payroll.html">工资设置</a></li>
 						<li><a href="staff-set-insurance.html">社保设置</a></li>
-						<li><a href="staff-input-set-welfare.html">福利设置</a></li>
 						<li><a href="staff-srt-commission.html">提成设置</a></li>
 						<li><a href="staff-set-approval.html">审批流程设置</a></li>
 					</ul>
@@ -151,7 +150,6 @@
 						<tbody>
 						<tr>
 							<th class="taC" width="150">考勤扣除基准</th><td width="260" colspan="3"><select><option>底薪</option><option>总扣除</option></select></td>
-
 						</tr>
 						</tbody>
 					</table>
@@ -164,5 +162,23 @@
 		</div>
 	</div>
 
+	<!--弹出完成数据-->
+	<div class="modal hide fade" id="done">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>完成本月考勤</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<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>
 <script type="text/javascript">autoFlashHeight();</script>
 </body>

+ 242 - 0
staff-commission.html

@@ -0,0 +1,242 @@
+<!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="报销单" 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-affixation.html">附加收支项</a></li>
+						<li class="topLine"><a href="staff-set-payroll.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">
+				<legend>本月(05.01-05.31)提成详情</legend>
+				<div class="demandCate">
+					<ul class="cateList">
+						<li>
+							<select class="select">
+								<option>显示有提成</option>
+								<option>显示无提成</option>
+								<option>所有</option>
+							</select>
+						</li>
+						<li>
+							<select class="select">
+								<option>全部</option>
+								<option>在职</option>
+								<option>离职</option>
+							</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">
+									<button class="btn btn-small" type="button">搜索</button>
+								</div>
+							</div>
+						</li>
+						<li>
+							本月(05.01-05.31):在职 89&nbsp;入职&nbsp;<a href="#">5</a>&nbsp;离职&nbsp;<a>4</a>
+						</li>
+						<li>
+							<a class="button" href="#upload" data-toggle="modal">上传本月销售提成</a>
+						</li>
+						<li>
+							<a class="button" href="#done" data-toggle="modal">完成本月提成</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></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></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></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></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></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 class="modal hide fade" id="detail">
+		<div class="modal-dialog modal-xlg">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>员工详情</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>
+				<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="upload">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>上传社保数据</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<p class="alert alert-info">本次上传为 本月提成 数据,请别上传错误数据!</p>
+					<table class="table table-bordered table-condensed">
+						<tbody>
+							<tr><th class="taC" width="150">选择Excel文件</th><td><input type="file"></td></tr>
+						</tbody>
+					</table>
+				</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">
+		<div class="modal-dialog">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>完成本月提成</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<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>
+<script type="text/javascript">autoFlashHeight();</script>
+<script type="text/javascript">$('#need-data').modal('show2')</script>
+</body>

+ 0 - 1
staff-employee.html

@@ -48,7 +48,6 @@
 						<li><a href="staff-affixation.html">附加收支项</a></li>
 						<li class="topLine"><a href="staff-set-payroll.html">工资设置</a></li>
 						<li><a href="staff-set-insurance.html">社保设置</a></li>
-						<li><a href="staff-input-set-welfare.html">福利设置</a></li>
 						<li><a href="staff-srt-commission.html">提成设置</a></li>
 						<li><a href="staff-set-approval.html">审批流程设置</a></li>
 					</ul>

+ 0 - 1
staff-home.html

@@ -48,7 +48,6 @@
 						<li><a href="staff-affixation.html">附加收支项</a></li>
 						<li class="topLine"><a href="staff-set-payroll.html">工资设置</a></li>
 						<li><a href="staff-set-insurance.html">社保设置</a></li>
-						<li><a href="staff-input-set-welfare.html">福利设置</a></li>
 						<li><a href="staff-srt-commission.html">提成设置</a></li>
 						<li><a href="staff-set-approval.html">审批流程设置</a></li>
 					</ul>

+ 0 - 1
staff-insurance.html

@@ -48,7 +48,6 @@
 						<li><a href="staff-affixation.html">附加收支项</a></li>
 						<li class="topLine"><a href="staff-set-payroll.html">工资设置</a></li>
 						<li><a href="staff-set-insurance.html">社保设置</a></li>
-						<li><a href="staff-input-set-welfare.html">福利设置</a></li>
 						<li><a href="staff-srt-commission.html">提成设置</a></li>
 						<li><a href="staff-set-approval.html">审批流程设置</a></li>
 					</ul>

+ 0 - 1
staff-payroll.html

@@ -48,7 +48,6 @@
 						<li><a href="staff-affixation.html">附加收支项</a></li>
 						<li class="topLine"><a href="staff-set-payroll.html">工资设置</a></li>
 						<li><a href="staff-set-insurance.html">社保设置</a></li>
-						<li><a href="staff-input-set-welfare.html">福利设置</a></li>
 						<li><a href="staff-srt-commission.html">提成设置</a></li>
 						<li><a href="staff-set-approval.html">审批流程设置</a></li>
 					</ul>

+ 0 - 1
staff-set-approval.html

@@ -48,7 +48,6 @@
 						<li><a href="staff-affixation.html">附加收支项</a></li>
 						<li class="topLine"><a href="staff-set-payroll.html">工资设置</a></li>
 						<li><a href="staff-set-insurance.html">社保设置</a></li>
-						<li><a href="staff-input-set-welfare.html">福利设置</a></li>
 						<li><a href="staff-srt-commission.html">提成设置</a></li>
 						<li><a href="staff-set-approval.html" class="selected">审批流程设置</a></li>
 					</ul>