Jelajahi Sumber

增加假期审批组可见性

Chente 9 tahun lalu
induk
melakukan
d1ee9db978
3 mengubah file dengan 46 tambahan dan 11 penghapusan
  1. 34 1
      admin-holidayGroup.html
  2. 7 5
      css/global.css
  3. 5 5
      saea-reportList-report.html

+ 34 - 1
admin-holidayGroup.html

@@ -30,7 +30,7 @@
 						<li><a href="admin-product.html">产品列表</a></li>
 						<li><a href="admin-reportGroup.html">报销审查组</a></li>
 						<li><a href="admin-demand.html">需求中心</a></li>
-						<li><a href="admin-reportGroup.html" class="selected">假期审查组</a></li>
+						<li><a href="admin-holidayGroup.html" class="selected">假期审查组</a></li>
 					</ul>
 				</div>
 			</div>
@@ -187,6 +187,7 @@
                 <tr>
                   <th>组描述</th>
                   <th>成员</th>
+                  <th>可见</th>
                   <th>审批组操作</th>
                 </tr>
               </thead>
@@ -194,11 +195,13 @@
                 <tr>
                   <td>适用销售人员、客服人员</td>
                   <td>谭玉堂->何银龄->赵淑燕->杨福芳</td>
+                  <td>总部、广东办 <a href="#view" data-toggle="modal">编辑</a></td>
                   <td><a href="#del" data-toggle="modal">删除审批组</a></td>
                 </tr>
                 <tr>
                   <td>适用开发部</td>
                   <td>谭玉堂->赵淑燕->杨福芳</td>
+                  <td>总部、广东办 <a href="#view" data-toggle="modal">编辑</a></td>
                   <td><a href="#del" data-toggle="modal">删除审批组</a></td>
                 </tr>
               </tbody>
@@ -207,7 +210,37 @@
 			</div>
 		</div>
 	</div>
+<!--弹出(编辑可见)-->
+<div class="modal hide fade" id="view">
 
+  <div class="modal-dialog">
+    <div class="modal-content">
+    <div class="modal-header">
+    <h3>设置审批组可见</h3>
+    </div>
+    <div class="modal-body">
+    	<div class="control-group">
+    		<div class="controls">
+				<label style="display:inline"><input type="checkbox" >总部</label>
+				<label style="display:inline"><input type="checkbox" >广东办</label>
+				<label style="display:inline"><input type="checkbox" >广西办</label>
+				<label style="display:inline"><input type="checkbox" >总部</label>
+				<label style="display:inline"><input type="checkbox" >广东办</label>
+				<label style="display:inline"><input type="checkbox" >广西办</label>
+				<label style="display:inline"><input type="checkbox" >总部</label>
+				<label style="display:inline"><input type="checkbox" >广东办</label>
+				<label style="display:inline"><input type="checkbox" >广西办</label>
+			</div>
+		</div>
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	    <a href="#" class="button" data-dismiss="modal" aria-hidden="true">确定</a>
+	</div>
+</div>
+</div>
+</div>
+<!--弹出-->
 <!--弹出(删除组)-->
 <div class="modal hide fade" id="del">
 

+ 7 - 5
css/global.css

@@ -1923,7 +1923,7 @@ a.new-ribbon:before{
   min-height:400px
 }
 .saeaList .seTable{
-  margin:0 25% 0 0;
+  margin:0 0 0 25.1%;
 }
 .saeaList .seTable .sFile{
   margin: 0 5px 5px 0;
@@ -2033,7 +2033,7 @@ table .taC{
 }
 .saeaList .seCensor {
   position: absolute;
-  right:0;
+  right:left;
   top:0;
   width:25%;
   height:100%;
@@ -2269,9 +2269,7 @@ table .taC{
 }
 .seCensor .reportButton {
   width:100%;
-  position: absolute;
-  bottom: 0;
-  right:0;
+  margin:2px 0;
 }
 .seCensor .reportButton button{
   border:none;
@@ -2286,6 +2284,8 @@ table .taC{
 }
 .reportButton a.buttonDone,.reportButton button.buttonDone{
   background:#7ea85c;
+  font-size: 16px;
+  margin-bottom: 2px
 }
 .reportButton a.buttonDone:hover,.reportButton button.buttonDone:hover{
   background:#4f8e08
@@ -2295,6 +2295,7 @@ table .taC{
 }
 .reportButton a.buttonUndone{
   background:#ce5e5e;
+  padding: 3px 0
 }
 .reportButton a.buttonUndone:hover{
   background:#c01010;
@@ -2304,6 +2305,7 @@ table .taC{
 }
 .reportButton a.buttonBack{
   background:#ffa132;
+  padding: 3px 0
 }
 .reportButton a.buttonBack:hover{
   background:#ff8a00;

+ 5 - 5
saea-reportList-report.html

@@ -89,6 +89,11 @@
 						<div class="title">
 							<span class="fR" title="创建时间">2015-01-13</span>#B201506249876
 						</div>
+						<div class="reportButton clearfix">
+							<a href="" class="buttonDone buttonBlock">同意支付</a>
+							<a href="" class="buttonBack" data-placement="top" data-toggle="ctooltip" data-original-title="上报人修改后由你继续审批">撤回</a>
+							<a href="" class="buttonUndone" data-placement="top" data-toggle="ctooltip" data-original-title="终止报销单">终止</a>
+						</div>
 						<div class="censorList clearfix censorHeight">
 							<ul>
 								<li class="post">
@@ -167,11 +172,6 @@
 								</li>
 							</ul>
 						</div>
-						<div class="reportButton">
-							<a href="" class="buttonBack" data-placement="top" data-toggle="ctooltip" data-original-title="上报人修改后由你继续审批">撤回</a>
-							<a href="" class="buttonUndone" data-placement="top" data-toggle="ctooltip" data-original-title="终止报销单">终止</a>
-							<a href="" class="buttonDone buttonBlock">同意支付</a>
-						</div>
 					</div>
 				</div>
 				<!--对公汇款审批-->