Merge branch 'master' of http://192.168.1.41:3000/S.H.I.E.L.D./CLD1.3.git

saea-receipt-add4.html

@@ -55,7 +55,7 @@
 			  		</div>
 		  			<div class="fixedSide" id="fixedSide">
 		  				<ul>
-		  					<li class="banshi active"><a href="#banshi">办事处</a></li>
+		  					<li class="banshi active"><a href="#banshi">日常相关</a></li>
 		  					<li class="chalv" style="display: none;"><a href="#chalv">差旅相关</a></li>
 		  					<li class="neibupeixun" style="display: none;"><a href="#neibupeixun">内部培训</a></li>
 		  					<li class="shenpi"><a href="#shenpi">审批</a></li>
@@ -68,7 +68,7 @@
 				  			<ul class="saeaType clearfix">
 				  				<li class="active" id="banshi-sw">
 				  					<i class="icon-">j</i>
-				  					办事处相关费用
+				  					日常相关费用
 				  				</li>
 				  				<li id="chalv-sw">
 				  					<i class="icon-">j</i>
@@ -79,14 +79,13 @@
 				  					内部培训费用
 				  				</li>
 				  			</ul>
-				  			<!--办事处相关费用-->
+				  			<!--日常相关费用-->
 				  			<div class="entry receipt-list" id="banshi">
 				  				<div class="seTable">
 				  					<table class="table table-bordered table-condensed table-hover mb-0">
 				  					<tbody>
-				  						<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 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>

saea-reportList-report2.html

@@ -211,6 +211,9 @@
 									<th>研究中心经费</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
 								</tr>
 								<tr>
+									<th>额外费用调整金额-备注</th><td colspan="2" class="taR">0</td><td class="taR">0%</td>
+								</tr>
+								<tr>
 									<th>支出小计</th><td class="taR" colspan="2"><b>0</b></td><td class="taR"><b>0%</b></td>
 								</tr>
 							</tbody>
@@ -587,6 +590,7 @@
 								<option>请选择</option>
 								<option>办公费(公司支出)</option>
 								<option>邮寄费(公司支出)</option>
+								<option>金额调整</option>
 							</select>
 						</tr>
 						<tr>