Przeglądaj źródła

费用管理新增费用;培训班结算 讲师增加提示信息

Chente 6 lat temu
rodzic
commit
1fd9556a4e

Plik diff jest za duży
+ 9 - 0
saea-dlist-category-year-detail.html


Plik diff jest za duży
+ 10 - 10
saea-dlist-staff-month-detail.html


Plik diff jest za duży
+ 8 - 8
saea-dlist-staff-month-detail2.html


Plik diff jest za duży
+ 10 - 0
saea-dlist-staff-year-detail.html


+ 9 - 0
saea-loan-add-receipt.html

@@ -148,6 +148,15 @@
 			  						<tr><th class="taR">合计</th><td class="colGreen taR">¥0.00</td></tr>
 			  						<tr><th colspan="2" class="taC">培训班费用</th></tr>
 			  						<tr><td colspan="2" class="taC"><p style="font-size:24px;margin:30px">如借款用于培训班,请在培训班结算中添加。</p></td></tr>
+			  						<tr><th colspan="2" class="taC">内部培训费用</th></tr>
+			  						<tr><th>场租费</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入场租费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+			  						<tr><th>住宿费</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入住宿费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+			  						<tr><th>交通费</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入交通费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+			  						<tr><th>餐饮费</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入餐饮费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+			  						<tr><th>办公费</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入办公费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+			  						<tr><th>餐费补助</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入公关费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+			  						<tr><th>其他</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入其他" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+			  						<tr><th class="taR">合计</th><td class="colGreen taR">¥0.00</td></tr>
 			  						<tr><th colspan="2" class="taC">其他</th></tr>
 			  						<tr><th>公关费</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入公关费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
 			  						<tr><th>广告费</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入公关费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>

+ 2 - 2
saea-receipt-add.html

@@ -70,14 +70,14 @@
 			  						<tr><th>出差补助</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入出差补助" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
 			  						<tr><th>其他费用</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入其他费用" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
 			  						<tr><th class="taR">合计</th><td class="colGreen taR">¥0.00</td></tr>
-			  						<tr><th colspan="2" class="taC">培训费用</th></tr>
+			  						<tr><th colspan="2" class="taC">内部培训费用</th></tr>
 			  						<tr><th>场租费</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入场租费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
 			  						<tr><th>薪酬</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入薪酬" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
 			  						<tr><th>住宿费</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入住宿费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
 			  						<tr><th>交通费</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入交通费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
 			  						<tr><th>餐饮费</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入餐饮费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
 			  						<tr><th>办公费</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入办公费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
-			  						<tr><th>公关费</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入公关费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
+			  						<tr><th>餐费补助</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入公关费" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
 			  						<tr><th>其他</th><td  width="200" class="taR">¥<input type="number" value="0" placeholder="输入其他" pattern="[0-9]" step="1" min="0" class="span2"></td></tr>
 			  						<tr><th class="taR">合计</th><td class="colGreen taR">¥0.00</td></tr>
 			  						<tr><th colspan="2" class="taC">其他</th></tr>

+ 1 - 1
saea-train-edit5.html

@@ -144,7 +144,7 @@
 								<option>税款</option>
 								<option>研究中心经费</option>
 							</select>
-							<p>公司支出的办公费和邮寄费,由审批人添加,无须再此添。</p>
+							<p class="colRed">公司支出的办公费和邮寄费,由审批人添加,无须再此添。</p>
 						</tr>
 						<tr>
 							<th class="taC">支出金额</th><td><input value="0" placeholder="输入支出金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>

+ 9 - 5
saea-train-edit6.html

@@ -82,7 +82,7 @@
 										<td><a href="">移除</a></td>
 									</tr>
 									<tr>
-										<td>外聘-张三</td>
+										<td>外聘(计税)-张三</td>
 										<td>1</td>
 										<td>2000.00</td>
 										<td>2000.00</td>
@@ -115,13 +115,15 @@
                 	<table class="table table-bordered table-condensed">
 						<tbody>
 						<tr>
-							<th class="taC">选择讲师类型</th>
+							<th class="taC" width="150">选择讲师类型</th>
 							<td>
 								<select>
 									<option>请选择</option>
 									<option>外聘</option>
 									<option>员工</option>
 								</select>
+								<p class="colRed">「员工」授课费,不计税,随工资一并发放。</p>
+								<p class="colRed">「外聘」授课费,有<b>计税</b>与<b>不计税</b>两种,单独发放给授课老师。</p>
 							</td>
 						</tr>
 					</tbody>
@@ -131,7 +133,7 @@
 					<tbody>
 						<tr><th colspan="2" class="taC">员工讲师</th></tr>
 						<tr>
-							<th class="taC">讲师</th><td>
+							<th class="taC" width="150">讲师</th><td>
 							<select>
 								<option>请选择</option>
 								<option>总部-何银龄</option>
@@ -154,7 +156,7 @@
 					<tbody>
 						<tr><th colspan="2" class="taC">外聘讲师</th></tr>
 						<tr>
-							<th class="taC">讲师</th><td>
+							<th class="taC" width="150">讲师</th><td>
 							<select>
 								<option>请选择</option>
 								<option>何银龄</option>
@@ -165,9 +167,11 @@
 							<th class="taC">计税</th><td>
 							<select>
 								<option>请选择</option>
-								<option>计税</option>
+								<option>计税(需计入税款中)</option>
 								<option>不计税(需提供发票)</option>
 							</select>
+							<p class="colRed">「计税(需计入税款)」计税,税金填写到「<a target="_blank" href="saea-train-edit5.html">支出</a>」的「税款」中。</p>
+							<p class="colRed">「不计税(需提供发票)」不需计税,需提供发票。</p>
 						</tr>
 						<tr>
 							<th class="taC">授课日数</th><td><input value="0" placeholder="输入授课天数" pattern="[0-9]" min="0" step="0.5" type="number"></td>

Plik diff jest za duży
+ 4 - 4
staff-commission-org.html


+ 1 - 1
staff-commission.html

@@ -55,7 +55,7 @@
 						<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-commission.html">提成设置</a></li>
 						<li><a href="staff-set-approval.html">审批流程设置</a></li>
 					</ul>
 				</div>

+ 111 - 0
staff-set-commission.html

@@ -0,0 +1,111 @@
+<!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">提成</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" class="selected">提成设置</a></li>
+						<li><a href="staff-set-approval.html">审批流程设置</a></li>
+					</ul>
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<legend>提成设置</legend>
+				<div class="saeaList">
+					<table class="table table-bordered table-hover">
+						<thead>
+						<tr class="thead"><th rowspan="2">办事处</th><th rowspan="2">提成分配人</th><th>添加分配人</th></tr>
+						</thead>
+						<tbody>
+						<tr><td>广东办</td><td>广东办-刘飞(<a href="#del" data-toggle="modal">移除</a>)广东办-姜栋(<a href="#del" data-toggle="modal">移除</a>)</td><td><a href="#add-staff" data-toggle="modal" >添加</a></td></tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+	</div>
+	<!--添加分配提成人-->
+	<div class="modal fade" id="add-staff">
+		<div class="modal-dialog">
+			<div class="modal-content">
+			    <div class="modal-header">
+			    	<h3>添加分配人</h3>
+			    </div>
+			    <div class="modal-body saeaList">
+			    	<select><option>广东办</option></select>
+			    	<select><option>刘飞</option></select>
+			    </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 fade" id="del">
+		<div class="modal-dialog">
+			<div class="modal-content">
+			    <div class="modal-header">
+			    	<h3>移除分配人</h3>
+			    </div>
+			    <div class="modal-body saeaList">
+			    	<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>