薪酬工资相关更新

admin-myinfo-borard.html

@@ -183,6 +183,7 @@
 								<tr><td class="taR">岗位工资</td><td class="taR">+￥6700</td></tr>
 								<tr><td class="taR">绩效奖金</td><td class="taR">+￥0.00</td></tr>
 								<tr><td class="taR">销售提成</td><td class="taR">+￥2000.00</td></tr>
+								<tr><td class="taR">讲课费</td><td class="taR">+￥2000.00</td></tr>
 								<tr><td class="taR">城市补助</td><td class="taR">+￥0.00</td></tr>
 								<tr><td class="taR">工龄工资</td><td class="taR">+￥300.00</td></tr>
 								<tr class="thead"><th>关爱通</th><th class="taR colRed">-￥0.00</th></tr>

staff-attendance.html

@@ -92,6 +92,9 @@
 							</div>
 						</li>
 						<li>
+							<a class="" href="#cardinal" data-toggle="modal">基数设置</a>
+						</li>
+						<li>
 							<a class="button" href="#done" data-toggle="modal">完成5月考勤</a>
 						</li>
 						<li>
@@ -102,11 +105,11 @@
 				<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><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>0</td><td>0</td><td>0</td><td>底薪</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>总工资</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>总工资</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>总工资</td></tr>
+						<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><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>底薪</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>Z0002</td><td><a href="#">王五</a></td><td>12345678901</td><td>实习</td><td>总部/研究中心</td><td>2017-05-30</td><td class="colRed"></td><td>总工资</td><td>0</td><td>0</td><td>0</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>总工资</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>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>总工资</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
 
 						</tbody>
 					</table>
@@ -164,7 +167,31 @@
 			</div>
 		</div>
 	</div>
-
+	<!--扣除基数-->
+	<div class="modal hide fade" id="cardinal">
+		<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 class="taC">工作日</th><td><input type="text" value="21.75"></td></tr>
+							<tr><th class="taC">病假基数</th><td><input type="text" value="63.26"> 珠海市最低工资标准1720/21.72*0.8</td></tr>
+							<tr><th class="taC"></th><td>病假扣除=工资日薪-病假基数</td></tr>
+							<tr><th class="taC">事假基数</th><td><p>总部按工资全额/工作日</p><p>营销部、研究中心即底薪/工作日</p></tr>
+							<tr><th class="taC">旷工</th><td><p>与事假相同</p></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">

staff-commission.html

@@ -120,11 +120,11 @@
 				<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>
+						<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></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>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></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></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></tr>
 						</tbody>
 					</table>
 				</div>

staff-guanaitong.html

@@ -114,11 +114,11 @@
 				<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></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></td><td></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></td><td></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></td><td></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></td><td></td></tr>
+						<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>固定金额</td><td>2000</td><td></td><td></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>组合</td><td>0</td><td></td><td></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>固定金额</td><td>0</td><td></td><td></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>薪酬比例</td><td>0</td><td></td><td></td></tr>
 						</tbody>
 					</table>
 				</div>
@@ -163,10 +163,11 @@
 						</table>
 						<table class="table table-bordered table-condensed">
 							<tr>
-								<th class="taC colGreen" colspan="2">关爱通</th>
+								<th class="taC colGreen" colspan="4">关爱通</th>
 							</tr>
 							<tr>
-								<th class="taC" width="150">发放金额</th><td><input type="number" value="2000"></td>
+								<th class="taC" width="150">发放类型</th><td><select><option>固定金额</option><option>薪酬比例</option><option>组合</option></select></td>
+								<th class="taC" width="150"><!-- 发放金额 --><!-- 工资比例（%） -->组合</th><td><!-- <input type="number" value="2000"> --><!-- <input type="number" value="10" max=10> --><input type="number" value="10" style="width:80px" max=10> % + <input type="number" value="600" style="width:80px"></td>
 							</tr>
 							<tr>
 								<th class="taC" width="150">发放原因</th><td><input type="text" value="" ></td>

staff-home-report.html

@@ -80,7 +80,7 @@
 						<thead>
 							<tr class="thead taC">
 								<th rowspan="2" class="taC">员工</th>
-								<th colspan="6" class="taC">薪酬收入(计税)</th>
+								<th colspan="8" class="taC">薪酬收入(计税)</th>
 								<th colspan="4" class="taC">社保公积金支出</th>
 								<th rowspan="2" class="taC">关爱通</th>
 								<th rowspan="2" class="taC">个税扣除</th>
@@ -88,19 +88,20 @@
 								<th rowspan="2" class="taC">税后支出</th>
 								<th rowspan="2" class="taC">实发工资</th>
 								<th rowspan="2" class="taC">工资单</th>
-								<th rowspan="2" class="taC">公积金公司</th>
 							</tr>
 							<tr class="taC">
 								<th class="taC">基本工资</th>
 								<th class="taC">岗位工资</th>
 								<th class="taC">绩效奖金</th>
 								<th class="taC">销售提成</th>
+								<th class="taC">讲课费</th>
 								<th class="taC">城市补助</th>
 								<th class="taC">工龄工资</th>
 								<th class="taC">福利奖金</th>
 								<th class="taC">社保个人</th>
 								<th class="taC">公积金个人</th>
 								<th class="taC">社保公司</th>
+								<th class="taC">公积金个人</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -122,6 +123,7 @@
 								<td class="taR">0.00</td>
 								<td class="taR">0.00</td>
 								<td class="taR">0.00</td>
+								<td class="taR">0.00</td>
 								<td class="taR"><a href="#payroll" data-toggle="modal">工资单</a></td>
 							</tr>
 							<tr>
@@ -142,6 +144,7 @@
 								<td class="taR">0.00</td>
 								<td class="taR">0.00</td>
 								<td class="taR">0.00</td>
+								<td class="taR">0.00</td>
 								<td class="taR"><a href="#payroll" data-toggle="modal">工资单</a></td>
 							</tr>
 							<tr>
@@ -162,6 +165,7 @@
 								<td class="taR">0.00</td>
 								<td class="taR">0.00</td>
 								<td class="taR">0.00</td>
+								<td class="taR">0.00</td>
 								<td class="taR"><a href="#payroll" data-toggle="modal">工资单</a></td>
 							</tr>
 							<tr class="warning">
@@ -173,11 +177,12 @@
 								<td class="taR colGreen">0.00</td>
 								<td class="taR colGreen">0.00</td>
 								<td class="taR colGreen">0.00</td>
-								<td class="taR colRed" rowspan="2">0.00</td>
-								<td class="taR colRed" rowspan="2">0.00</td>
-								<td class="taR colRed" rowspan="2">0.00</td>
-								<td class="taR colRed" rowspan="2">0.00</td>
-								<td class="taR colRed" rowspan="2">0.00</td>
+								<td class="taR colGreen">0.00</td>
+								<td class="taR colRed" rowspan="">0.00</td>
+								<td class="taR colRed" rowspan="">0.00</td>
+								<td class="taR colRed" rowspan="">0.00</td>
+								<td class="taR colRed" rowspan="">0.00</td>
+								<td class="taR colRed" rowspan="">0.00</td>
 								<td class="taR colRed" rowspan="2">0.00</td>
 								<td class="taR colGreen" rowspan="2">0.00</td>
 								<td class="taR colRed" rowspan="2">0.00</td>
@@ -185,7 +190,8 @@
 								<td class="taR" rowspan="2">0.00</td>
 							</tr>
 							<tr class="warning">
-								<td class="taR colGreen" colspan="7">0.00</td>
+								<td class="taR colGreen" colspan="8">0.00</td>
+								<td class="taR colRed" colspan="5">0.00</td>
 							</tr>
 						</tbody>
 					</table>
@@ -305,6 +311,7 @@
 								<tr><td class="taR">岗位工资</td><td class="taR">+￥6700</td></tr>
 								<tr><td class="taR">绩效奖金</td><td class="taR">+￥0.00</td></tr>
 								<tr><td class="taR">销售提成</td><td class="taR">+￥2000.00</td></tr>
+								<tr><td class="taR">讲课费</td><td class="taR">+￥2000.00</td></tr>
 								<tr><td class="taR">城市补助</td><td class="taR">+￥0.00</td></tr>
 								<tr><td class="taR">工龄工资</td><td class="taR">+￥300.00</td></tr>
 								<tr class="thead"><th>关爱通</th><th class="taR colRed">-￥0.00</th></tr>

staff-payroll.html

@@ -120,7 +120,7 @@
 				<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><th>其他收入</th><th>实发工资</th></tr>
+						<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><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>9700</td><td>0</td><td>2000</td><td>6170</td><td>400</td><td>5930</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>10000</td><td>1000</td><td>0</td><td>2000</td><td>0</td><td>9000</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>10000</td><td>3000</td><td>0</td><td>2000</td><td>0</td><td>11000</td></tr>
@@ -177,11 +177,14 @@
 							</tr>
 							<tr>
 								<th class="taC" width="150">绩效奖金</th><td width="210"><input type="number" value="0"></td>
+								<th class="taC" width="150">城市补助</th><td width="210"><input type="number" value=""></td>
+							</tr>
+							<tr>
 								<th class="taC" width="150">销售提成</th><td><input type="number" value="2000" disabled></td>
+								<th class="taC" width="150">讲课费</th><td><input type="text" value="300"disabled></td>
 							</tr>
 							<tr>
-								<th class="taC" width="150">城市补助</th><td width="210"><input type="number" value=""></td>
-								<th class="taC" width="150">工龄工资</th><td><input type="text" value="300"disabled></td>
+								<th class="taC" width="150">工龄工资</th><td colspan="3"><input type="text" value="300"disabled></td>
 							</tr>
 							<tr>
 								<th class="taC" width="150">电脑补助 01/12期</th><td width="210"><input type="number" value="100" disabled></td>