Procházet zdrojové kódy

增加撤销原因

outaozhen před 7 roky
rodič
revize
4b5d3cca34
2 změnil soubory, kde provedl 9 přidání a 3 odebrání
  1. 5 2
      holiday-reportList-all.html
  2. 4 1
      holiday-reportList.html

+ 5 - 2
holiday-reportList-all.html

@@ -72,7 +72,7 @@
 										<td>2017年1月1日</td>
 										<td>2017年1月1日</td>
 										<td>1</td>
-										<td class="colOrange">撤销</td>
+										<td class="colOrange"><a href="#holiday-detail" data-toggle="modal">撤销</a></td>
 										<td>2016-03-03 11:30:03</td>
 									</tr>
 									<tr>
@@ -177,11 +177,14 @@
 								</blockquote>
 							</td>
 						</tr>
+						<tr>
+							<th class="taC">撤销原因</th><td colspan="3">撤销原因</td>
+						</tr>
 						</tbody>
 					</table>
 			  </div>
 		    <div class="modal-footer">
-		    	<a href="#" class="button" data-dismiss="modal">撤销假条</a>
+		    	<!-- <a href="#" class="button" data-dismiss="modal">撤销假条</a> -->
 		      <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 		    </div>
       </div>

+ 4 - 1
holiday-reportList.html

@@ -72,7 +72,7 @@
 								</table>
 							</div>
 							<div class="clearfix">
-								<legend><div class="fR"><a href="#">查看更多</a></div>需要您审批</legend>
+								<legend><div class="fR"></div>需要您审批</legend>
 								<table class="table table-bordered table-condensed">
 									<tbody>
 									<tr><th class="taC">申请人</th><th class="taC">类型</th><th class="taC">开始日期</th><th class="taC">结束日期</th><th class="taC" width="90">合计天数</th><th class="taC">上一位审批</th><th class="taC">操作</th></tr>
@@ -246,6 +246,9 @@
 								</blockquote>
 							</td>
 						</tr>
+						<tr>
+							<th class="taC">撤销原因</th><td colspan="3"><textarea  style="width:735px;" rows="3"placeholder="请填写撤销原因"></textarea></td>
+						</tr>
 						</tbody>
 					</table>
 			  </div>