审批流

src/main/webapp/resources/css/b2bCommon.css

@@ -475,10 +475,10 @@ table.b2b-modal-table > tbody > tr > td {
     margin: 60px auto 0;
 }
 .no-padding {
-    padding: 0;
+    padding: 0 !important;
 }
 .no-margin {
-    margin: 0;
+    margin: 0 !important;
 }
 .btn-warning {
     color: #5078cb;

src/main/webapp/resources/view/sso/b2b/modal/step1.html

@@ -30,6 +30,9 @@
         right: 5px;
         top: 8px;
         text-align: center;
+        cursor: pointer;
+        font-size: 14px;
+        color: #fff;
     }
 
     .tanchuang .box01, .tanchuang .box02 {
@@ -153,7 +156,7 @@
         content: "";
         width: 76px;
         height: 6px;
-        background: url(../img/approvalFlow/dot01.png) no-repeat;
+        background: url("static/img/approvalFlow/dot01.png") no-repeat;
         display: inline-block;
         position: absolute;
         top: 40px;
@@ -376,7 +379,7 @@
         position: absolute;
         top: 250px;
         right: -23px;
-        background: url("../img/approvalFlow/dot02.png") no-repeat;
+        background: url("static/img/approvalFlow/dot02.png") no-repeat;
     }
 
     .box_list dl {
@@ -466,7 +469,7 @@
         height: 16px;
         display: inline-block;
         position: absolute;
-        background: url("../img/approvalFlow/sreach_bt.png") no-repeat center;
+        background: url("static/img/approvalFlow/sreach_bt.png") no-repeat center;
         background-position: -16px 0;
         overflow: hidden;
         top: 5px;
@@ -528,7 +531,7 @@
         width: 22px;
         height: 8px;
         display: inline-block;
-        background: url("../img/approvalFlow/inco_list.png") no-repeat;
+        background: url("static/img/approvalFlow/inco_list.png") no-repeat;
         background-position: -5px -23px;
         position: absolute;
         right: 65px;
@@ -544,7 +547,7 @@
         width: 18px;
         height: 18px;
         display: inline-block;
-        background: url("../img/approvalFlow/inco_list.png") no-repeat;
+        background: url("static/img/approvalFlow/inco_list.png") no-repeat;
         background-position: 0 -1px;
         position: absolute;
         top: -8px;
@@ -560,13 +563,31 @@
         bottom: 0;
         right: 0;
     }
-
+    .box_040103 {
+        width: 980px;
+        background: #fff;
+        margin-left: -250px;
+        text-align: center;
+        padding-bottom: 20px;
+        margin-top: 0;
+    }
+    .tanchuang .box p span {
+        float: none;
+        line-height: inherit;
+    }
+    .tanchuang .box p {
+        border-bottom: 0;
+        height: 30px;
+        line-height: 30px;
+        background: #5078cb;
+        color: #fff;
+    }
 </style>
 <!--弹出框01 审批人设置-->
 <div class="tanchuang" id="step1">
 	<!--弹出框01 设置-企业设置-审批流-审批人设置-->
-	<div class="box box01">
-    	<i class="off"><img src="static/img/approvalFlow/close.png" alt="" ng-click="cancel()"></i>
+	<div class="box box01 no-padding">
+    	<i class="off fa fa-close" ng-click="cancel()"></i>
         <p><span>{{appName}}-审批人设置</span></p>
         <div class="box01_01">
         	<span class="sp01"><input type="radio" name="radio01" checked>不分条件设置审批人</span>
@@ -597,66 +618,64 @@
            	 </div>
         </div>
         <div class="box01_03">
-        	<a class="btn01" ng-click="saveNode()" disabled="disabled">保存</a><a class="btn02" ng-click="cancel()">取消</a>
+        	<button style="margin-right: 30px;" class="btn01 b2b-btn b2b-btn-submit" ng-click="saveNode()" disabled="disabled">保存</button><button class="btn02  b2b-btn b2b-btn-cancel" ng-click="cancel()">取消</button>
         </div>
     </div>
 </div>
 <div class="tanchuang" style="display: none" id="NodeSet">
     <!--弹出框04 设置-企业设置-审批流-审批人设置-设置-->
     <div class="box box04">
-        <i class="off"><img src="static/img/approvalFlow/close.png" alt="" ng-click="cancel()"></i>
-        <div style="background: #fff;">
-            <div class="box_content clearfix">
-                <div class="box_content01">
-                    <h4>{{appName}}-已选审批节点</h4>
-                    <div class="box_list">
-                        <dl >
-                            <dd ng-repeat="flow in AppFlow.appNodes" class="caozuo01"  ng-click="deleteNode($index)">
-                                <a href="#" ng-bind="flow.username ? flow.username : flow.position" ng-class="{'jiantou': !$first}"></a>
-                            </dd>
-                        </dl>
-                        <h5 ng-if="AppFlow.appNodes.length==0">请从右侧选择审批节点</h5>
-                    </div>
-                    <a href="#" class="dot02" ></a>
+        <!--<i class="off"><img src="static/img/approvalFlow/close.png" alt="" ng-click="cancel()"></i>-->
+        <div class="box_content clearfix">
+            <div class="box_content01">
+                <h4>{{appName}}-已选审批节点</h4>
+                <div class="box_list">
+                    <dl >
+                        <dd ng-repeat="flow in AppFlow.appNodes" class="caozuo01"  ng-click="deleteNode($index)">
+                            <a href="#" ng-bind="flow.username ? flow.username : flow.position" ng-class="{'jiantou': !$first}"></a>
+                        </dd>
+                    </dl>
+                    <h5 ng-if="AppFlow.appNodes.length==0">请从右侧选择审批节点</h5>
                 </div>
-                <div class="box_content01">
-                    <h4>角色<font>（不受人员异动的影响）</font></h4>
-                    <div class="box_list">
-                        <dl>
-                            <dt>人员类型</dt>
-                            <dd>
-                                <a href="#">普通用户</a>
-                                <a href="#">管理员</a>
-                            </dd>
-                        </dl>
-                        <dl>
-                            <dt>用户角色</dt>
-                            <dd ng-repeat="role in roles">
-                                <a ng-click="SelectRole(role)" ng-if="role!='{}'">{{role}}</a>
-                                <a ng-click="" ng-if="role='{}'" >暂无角色</a>
-                            </dd>
-                        </dl>
-                    </div>
+                <a href="#" class="dot02" ></a>
+            </div>
+            <div class="box_content01">
+                <h4>角色<font>（不受人员异动的影响）</font></h4>
+                <div class="box_list">
+                    <dl>
+                        <dt>人员类型</dt>
+                        <dd>
+                            <a href="#">普通用户</a>
+                            <a href="#">管理员</a>
+                        </dd>
+                    </dl>
+                    <dl>
+                        <dt>用户角色</dt>
+                        <dd ng-repeat="role in roles">
+                            <a ng-click="SelectRole(role)" ng-if="role!='{}'">{{role}}</a>
+                            <a ng-click="" ng-if="role='{}'" >暂无角色</a>
+                        </dd>
+                    </dl>
                 </div>
-                <div class="box_content01">
-                    <h4>指定人员<font>（受人员异动的影响）</font></h4>
-                    <div class="box_list">
-                        <div class="sreach"><input type="search"  placeholder="请输入姓名/部门搜索" ng-model="keyword" ng-search="search(keyword)"><button></button> </div>
-                        <div style="position: relative; overflow-y: auto; overflow-x: hidden;max-height: 380px;">
-                            <div class="zimu"><span>C</span></div>
-                            <ul ng-repeat="user in users| filter: keyword">
-                                <li ><span><em>{{user.username}}</em>
+            </div>
+            <div class="box_content01">
+                <h4>指定人员<font>（受人员异动的影响）</font></h4>
+                <div class="box_list">
+                    <div class="sreach"><input type="search"  placeholder="请输入姓名/部门搜索" ng-model="keyword" ng-search="search(keyword)"><button></button> </div>
+                    <div style="position: relative; overflow-y: auto; overflow-x: hidden;max-height: 380px;">
+                        <div class="zimu"><span>C</span></div>
+                        <ul ng-repeat="user in users| filter: keyword">
+                            <li ><span><em>{{user.username}}</em>
                    			{{user.department}} {{user.role}}
                    			<a ng-click="SelectUser(user)">添加</a>
-                                </li>
-                            </ul>
-                        </div>
+                            </li>
+                        </ul>
                     </div>
                 </div>
             </div>
-            <div class="box01_03">
-                <a class="btn01" href="#">保存</a><a class="btn02" ng-click="cancel()">取消</a>
-            </div>
+        </div>
+        <div class="box01_03 box_040103">
+            <button style="margin-right: 30px;" class="btn01  b2b-btn b2b-btn-submit" href="#">保存</button><button class="btn02  b2b-btn b2b-btn-cancel" ng-click="cancel()">取消</button>
         </div>
     </div>
 </div>