Browse Source

处理bug,修改主题色

Administrator 7 years ago
parent
commit
39cef92608
31 changed files with 47 additions and 53 deletions
  1. 1 1
      src/main/webapp/resources/css/add.css
  2. 1 1
      src/main/webapp/resources/css/deputyOrder/order.css
  3. 1 1
      src/main/webapp/resources/css/style.css
  4. 1 1
      src/main/webapp/resources/tpl/index/approvalFlow/4.html
  5. 1 1
      src/main/webapp/resources/tpl/index/approvalFlow/5.html
  6. 1 1
      src/main/webapp/resources/tpl/index/approvalFlow/6.html
  7. 1 1
      src/main/webapp/resources/tpl/index/approvalFlow/7.html
  8. 1 1
      src/main/webapp/resources/tpl/index/approvalFlow/8.html
  9. 1 1
      src/main/webapp/resources/tpl/index/approvalFlow/9.html
  10. 2 2
      src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html
  11. 1 1
      src/main/webapp/resources/tpl/index/approvalFlow/home.html
  12. 1 1
      src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html
  13. 1 1
      src/main/webapp/resources/tpl/index/purc/addOrder.html
  14. 1 1
      src/main/webapp/resources/tpl/index/purc/cart_detail.html
  15. 1 1
      src/main/webapp/resources/tpl/index/purc/inquiryInfo_detail.html
  16. 1 1
      src/main/webapp/resources/tpl/index/purc/inquiry_new.html
  17. 9 15
      src/main/webapp/resources/tpl/index/purc/prodList.html
  18. 1 1
      src/main/webapp/resources/tpl/index/purc/pubInquiry_detail.html
  19. 1 1
      src/main/webapp/resources/tpl/index/purc/pubInquiry_new.html
  20. 2 2
      src/main/webapp/resources/tpl/index/purc/purcinquiry_new.html
  21. 3 3
      src/main/webapp/resources/tpl/index/purc/saved_tender.html
  22. 3 3
      src/main/webapp/resources/tpl/index/purc/tender.html
  23. 1 1
      src/main/webapp/resources/tpl/index/purc/tender_answer_detail.html
  24. 1 1
      src/main/webapp/resources/tpl/index/purc/tender_evaluation.html
  25. 1 1
      src/main/webapp/resources/tpl/index/purc/vendor_detail.html
  26. 2 2
      src/main/webapp/resources/tpl/index/sale/customer_detail.html
  27. 2 2
      src/main/webapp/resources/tpl/index/sale/open_tender_detail.html
  28. 1 1
      src/main/webapp/resources/tpl/index/sale/open_tender_list.html
  29. 1 1
      src/main/webapp/resources/tpl/index/sale/tender.html
  30. 1 1
      src/main/webapp/resources/tpl/index/sale/tender_question_detail.html
  31. 1 1
      src/main/webapp/resources/tpl/index/sale/vendor_tender.html

+ 1 - 1
src/main/webapp/resources/css/add.css

@@ -564,7 +564,7 @@ input:focus, select:focus {
 }
 /*产品资料-价格-新增*/
 .com_head a {
-    color: #3f84f6;
+    color: #fff;
     float: right;
     margin-right: 40px;
     font-size: 14px;

+ 1 - 1
src/main/webapp/resources/css/deputyOrder/order.css

@@ -31,7 +31,7 @@ body {
 }
 
 .com_head a {
-    color:#3f84f6;
+    color:#fff;
     float:right;
     margin-right:40px;
 }

+ 1 - 1
src/main/webapp/resources/css/style.css

@@ -77,7 +77,7 @@ body {
 }
 
 .com_head a {
-	color: #3f84f6;
+	color: #fff;
 	float: right;
 	margin-right: 40px;
 }

+ 1 - 1
src/main/webapp/resources/tpl/index/approvalFlow/4.html

@@ -24,7 +24,7 @@
         </div>
         <div class="shenliu_right">
         	<div class="com_title">设置>企业设置<font>>审批流</font></div>
-            <div class="com_head"><span>审批流设置</span><a href="#">+新增审批</a></div>
+            <div class="com_head"><span>审批流设置</span><a href="#"><i class="fa fa-fw fa-p"></i>新增审批</a></div>
             <div class="com_head01"><span>已启用的审批流程</span></div>
             <div class="com_content">
                 <ul>

+ 1 - 1
src/main/webapp/resources/tpl/index/approvalFlow/5.html

@@ -24,7 +24,7 @@
         </div>
         <div class="shenliu_right">
         	<div class="com_title">设置>企业设置<font>>审批流</font></div>
-            <div class="com_head"><span>审批流设置</span><a href="#">+新增审批</a></div>
+            <div class="com_head"><span>审批流设置</span><a href="#"><i class="fa fa-plus-square fa-fw"></i>新增审批</a></div>
             <div class="com_head01"><span>已启用的审批流程</span></div>
             <div class="com_content">
                 <ul>

+ 1 - 1
src/main/webapp/resources/tpl/index/approvalFlow/6.html

@@ -24,7 +24,7 @@
         </div>
         <div class="shenliu_right">
         	<div class="com_title">设置>企业设置<font>>审批流</font></div>
-            <div class="com_head"><span>审批流设置</span><a href="#">+新增审批</a></div>
+            <div class="com_head"><span>审批流设置</span><a href="#"><i class="fa fa-plus-square fa-fw"></i>新增审批</a></div>
             <div class="com_head01"><span>已启用的审批流程</span></div>
             <div class="com_content">
                 <ul>

+ 1 - 1
src/main/webapp/resources/tpl/index/approvalFlow/7.html

@@ -24,7 +24,7 @@
         </div>
         <div class="shenliu_right">
         	<div class="com_title">设置>企业设置<font>>审批流</font></div>
-            <div class="com_head"><span>审批流设置</span><a href="#">+新增审批</a></div>
+            <div class="com_head"><span>审批流设置</span><a href="#"><i class="fa fa-plus-square fa-fw"></i>新增审批</a></div>
             <div class="com_head01"><span>已启用的审批流程</span></div>
             <div class="com_content">
                 <ul>

+ 1 - 1
src/main/webapp/resources/tpl/index/approvalFlow/8.html

@@ -24,7 +24,7 @@
         </div>
         <div class="shenliu_right">
         	<div class="com_title">设置>企业设置<font>>审批流</font></div>
-            <div class="com_head"><span>审批流设置</span><a href="#">+新增审批</a></div>
+            <div class="com_head"><span>审批流设置</span><a href="#"><i class="fa fa-plus-square fa-fw"></i>新增审批</a></div>
             <div class="com_head01"><span>已启用的审批流程</span></div>
             <div class="com_content">
                 <ul>

+ 1 - 1
src/main/webapp/resources/tpl/index/approvalFlow/9.html

@@ -24,7 +24,7 @@
         </div>
         <div class="shenliu_right">
         	<div class="com_title">设置>企业设置<font>>审批流</font></div>
-            <div class="com_head"><span>审批流设置</span><a href="#">+新增审批</a></div>
+            <div class="com_head"><span>审批流设置</span><a href="#"><i class="fa fa-plus-square fa-fw"></i>新增审批</a></div>
             <div class="com_head01"><span>已启用的审批流程</span></div>
             <div class="com_content">
                 <ul>

+ 2 - 2
src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -714,7 +714,7 @@
 	</div>
 	<div class="com_title01"><span>收货人信息</span>
 		<a ng-click="$open = !$open" ng-show="ships.length>1"><span ng-bind="$open ? '收起' : '展开'"></span><i class="fa fa-angle-down" ng-class="{'fa-angle-up':$open, 'fa-angle-down': !$open}"></i></a>
-		<a ng-show="!connectionEditings"  class="pull-right add-address" href="javascript:void(0);">+新增收货人</a>
+		<a ng-show="!connectionEditings"  class="pull-right add-address" href="javascript:void(0);"><i class="fa fa-plus-square fa-fw"></i>新增收货人</a>
 		<a ng-show="connectionEditings" ng-click="connectionEditings = false" class="pull-right text-simple color01"><i
 				class="fa fa-reply-all fa-fw"></i>取消</a>
 		<a ng-show="connectionEditings" ng-click="updateDetailInfo()" class="pull-right text-simple color02"><i
@@ -789,7 +789,7 @@
 	<div ng-if="deputyEnter.deputyEnterprise">
 		<div class="com_title01"><span>付款企业信息</span>
 			<a ng-click="$open01 = !$open01" ng-show="pays.length>1"><span ng-bind="$open01 ? '收起' : '展开'"></span><i class="fa fa-angle-down" ng-class="{'fa-angle-up':$open01, 'fa-angle-down': !$open01}"></i></a>
-			<a ng-show="!connectionEditings"  class="pull-right add-paycompany" ng-click="addPayCompany()">+新增付款企业</a>
+			<a ng-show="!connectionEditings"  class="pull-right add-paycompany" ng-click="addPayCompany()"><i class="fa fa-plus-square fa-fw"></i>新增付款企业</a>
 			<a ng-show="connectionEditings" ng-click="connectionEditings = false" class="pull-right text-simple color01"><i
 					class="fa fa-reply-all fa-fw"></i>取消</a>
 			<a ng-show="connectionEditings" ng-click="updateDetailInfo()" class="pull-right text-simple color02"><i

+ 1 - 1
src/main/webapp/resources/tpl/index/approvalFlow/home.html

@@ -21,7 +21,7 @@
         <!--左侧内容-->
         <div class="shenliu_right">
         	<!--<div class="com_title">设置>企业设置<font>>审批流</font></div>-->
-            <div class="com_head"><span>审批流设置</span><a >+新增审批</a></div>
+            <div class="com_head"><span>审批流设置</span><a ><i class="fa fa-plus-square fa-fw"></i>新增审批</a></div>
             <div class="com_content" >
             	<ul>
                 	<li>

+ 1 - 1
src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html

@@ -298,7 +298,7 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .com_head a {
-	color: #3f84f6;
+	color: #fff;
 	float: right;
 	margin-right: 40px;
 	font-size: 14px;

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/addOrder.html

@@ -131,7 +131,7 @@
 								class="select fl" ng-model="order.shipadd" required="required"
 								ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
 									<option value="">请选择收货地址</option>
-							</select> <a href="javascript:void(0);" class="add-address">+新增收货信息</a>
+							</select> <a href="javascript:void(0);" class="add-address"><i class="fa fa-plus-square fa-fw"></i>新增收货信息</a>
 							</span>
 						</div>
 					</li>

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/cart_detail.html

@@ -126,7 +126,7 @@
 									ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
 									<option value="">{{order.shipAddress}}</option>
 								</select> 
-								<a href="javascript:void(0);" class="add-address">+新增收货信息</a>
+								<a href="javascript:void(0);" class="add-address"><i class="fa fa-plus-square fa-fw"></i>新增收货信息</a>
 							</span>
 						</div>
 					</li>

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/inquiryInfo_detail.html

@@ -144,7 +144,7 @@
 }
 
 .com_head a {
-	color: #3f84f6;
+	color: #fff;
 	float: right;
 	margin-right: 40px;
 	font-size: 14px;

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/inquiry_new.html

@@ -298,7 +298,7 @@
     }
 
     .com_head a {
-        color: #3f84f6;
+        color: #fff;
         float: right;
         margin-right: 40px;
         font-size: 14px;

+ 9 - 15
src/main/webapp/resources/tpl/index/purc/prodList.html

@@ -259,21 +259,6 @@
                 <td colspan="5"></td>
             </tr>-->
             </thead>
-            <tbody ng-if="$data.length === 0">
-            <tr>
-                <td colspan="6">
-                    <div id="empty">
-                        <div class="left_img">
-                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
-                        </div>
-                        <div class="right_link">
-                            <p>暂无对应的物料信息</p>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            </tbody>
             <tbody ng-repeat="product in $data">
             <tr class="order-hd">
             	<!--<td class="text-center"><input type="checkbox" ng-model="product.checked" ng-click="checkOne(product)" ng-disabled="product.cmpUuId != null"></td>-->
@@ -297,6 +282,15 @@
             </tr>
             </tbody>
         </table>
+        <div id="empty" ng-if="tableParams.total() == 0">
+            <div class="left_img">
+                <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                <a href="#/index" title="B2B商务首页">B2B 商务</a>
+            </div>
+            <div class="right_link">
+                <p>暂无对应的物料信息</p>
+            </div>
+        </div>
     </div>
 </div>
 

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/pubInquiry_detail.html

@@ -144,7 +144,7 @@
 }
 
 .com_head a {
-	color: #3f84f6;
+	color: #fff;
 	float: right;
 	margin-right: 40px;
 	font-size: 14px;

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/pubInquiry_new.html

@@ -298,7 +298,7 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .com_head a {
-	color: #3f84f6;
+	color: #fff;
 	float: right;
 	margin-right: 40px;
 	font-size: 14px;

+ 2 - 2
src/main/webapp/resources/tpl/index/purc/purcinquiry_new.html

@@ -300,7 +300,7 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .com_head a {
-	color: #3f84f6;
+	color: #fff;
 	float: right;
 	margin-right: 40px;
 	font-size: 14px;
@@ -982,7 +982,7 @@ select.disabled {
 	                             <select class="select fl" style="width: 70%; height: 34px; line-height: 34px; font-size: 14px;" ng-model="inquiry.ship" required="required" ng-options="(ship.address + ship.addressdet + ship.receiver + ship.usertel) as (ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
 									<option value="">请选择收货地址</option>
 								 </select>
-	                            <a href="javascript:void(0);" class="add-address">+新增收货信息</a>
+	                            <a href="javascript:void(0);" class="add-address"><i class="fa fa-plus-square fa-fw"></i>新增收货信息</a>
 	                        </span>
 	                   		</span>
 	                    </div>

+ 3 - 3
src/main/webapp/resources/tpl/index/purc/saved_tender.html

@@ -317,7 +317,7 @@
     }
 
     .com_head a {
-        color: #3f84f6;
+        color: #fff;
         float: right;
         margin-right: 40px;
         font-size: 14px;
@@ -818,7 +818,7 @@
                              <select class="select fl" style="width: 70%; height: 34px; line-height: 34px; font-size: 14px;" ng-model="tender.shipadd" required="required" ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
 								<option value="">请选择收货地址</option>
 							</select>
-                            <a href="javascript:void(0);" class="add-address">+新增收货地址</a>
+                            <a href="javascript:void(0);" class="add-address"><i class="fa fa-plus-square fa-fw"></i>新增收货地址</a>
                         </span>
                     </div>
                     <div class="col-xs-12" ng-show="isSave">
@@ -833,7 +833,7 @@
                              <select class="select fl" style="width: 70%; height: 34px; line-height: 34px; font-size: 14px;" ng-model="tender.shipadd" required="required" ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
 								<option value="">请选择收货地址</option>
 							</select>
-                            <a href="javascript:void(0);" class="add-address">+新增收货地址</a>
+                            <a href="javascript:void(0);" class="add-address"><i class="fa fa-plus-square fa-fw"></i>新增收货地址</a>
                         </span>
                     </div>
                     <div class="col-xs-4">

+ 3 - 3
src/main/webapp/resources/tpl/index/purc/tender.html

@@ -317,7 +317,7 @@ input[type="radio"], input[type="checkbox"] {
 }
 
 .com_head a {
-	color: #3f84f6;
+	color: #fff;
 	float: right;
 	margin-right: 40px;
 	font-size: 14px;
@@ -816,7 +816,7 @@ input[type="radio"], input[type="checkbox"] {
                              <select class="select fl" style="width: 70%; height: 34px; line-height: 34px; font-size: 14px;" ng-model="tender.shipadd" required="required" ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
 								<option value="">请选择收货地址</option>
 							</select>
-                            <a href="javascript:void(0);" class="add-address">+新增收货地址</a>
+                            <a href="javascript:void(0);" class="add-address"><i class="fa fa-plus-square fa-fw"></i>新增收货地址</a>
                         </span>
                     </div>
                     <div class="col-xs-12" ng-show="isSave">
@@ -831,7 +831,7 @@ input[type="radio"], input[type="checkbox"] {
                              <select class="select fl" style="width: 70%; height: 34px; line-height: 34px; font-size: 14px;" ng-model="tender.shipadd" required="required" ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
 								<option value="">请选择收货地址</option>
 							</select>
-                            <a href="javascript:void(0);" class="add-address">+新增收货地址</a>
+                            <a href="javascript:void(0);" class="add-address"><i class="fa fa-plus-square fa-fw"></i>新增收货地址</a>
                         </span>
                     </div>
                     <div class="col-xs-4">

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/tender_answer_detail.html

@@ -160,7 +160,7 @@
         border: none;
     }
 
-    .com_head a{color:#3f84f6;float:right;margin-right:40px;font-size: 14px;}
+    .com_head a{color:#fff;float:right;margin-right:40px;font-size: 14px;}
     .com_head a i{margin-left: 5px;line-height: 40px;}
     .com_head a:hover{color: #d2272d;}
 

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/tender_evaluation.html

@@ -144,7 +144,7 @@
         outline: none;
     }
 
-    .com_head a{color:#3f84f6;float:right;margin-right:40px;font-size: 14px;}
+    .com_head a{color:#fff;float:right;margin-right:40px;font-size: 14px;}
     .com_head a i{margin-left: 5px;line-height: 40px;}
     .com_head a:hover{color: #d2272d;}
 

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/vendor_detail.html

@@ -69,7 +69,7 @@
                 </dd>
             </dl>
             <!--客户联系人-->
-            <div class="com_title01"><span>供应商联系人</span><a ng-click="addContact(vendor.uu)">+新增供应商联系人</a></div>
+            <div class="com_title01"><span>供应商联系人</span><a ng-click="addContact(vendor.uu)"><i class="fa fa-plus-square fa-fw"></i>新增供应商联系人</a></div>
             <div class="supply-list01 pro-info clearfix">
                 <dl>
                     <dt>

+ 2 - 2
src/main/webapp/resources/tpl/index/sale/customer_detail.html

@@ -53,7 +53,7 @@
                 </dd>
             </dl>
             <!--客户联系人-->
-            <div class="com_title01"><span>客户联系人</span><a ng-click="addContact(customer.uu)">+新增客户联系人</a></div>
+            <div class="com_title01"><span>客户联系人</span><a ng-click="addContact(customer.uu)"><i class="fa fa-plus-square fa-fw"></i>新增客户联系人</a></div>
             <div class="supply-list01 pro-info clearfix">
                 <dl>
                     <dt>
@@ -79,7 +79,7 @@
                     </dd>
                 </dl>
             </div>
-            <div class="com_title01"><span>已分配人员</span><a ng-click="addUserInfo()">+新增分配人员</a></div>
+            <div class="com_title01"><span>已分配人员</span><a ng-click="addUserInfo()"><i class="fa fa-plus-square fa-fw"></i>新增分配人员</a></div>
             <div class="supply-list01 pro-info clearfix">
                 <dl>
                     <dt>

+ 2 - 2
src/main/webapp/resources/tpl/index/sale/open_tender_detail.html

@@ -281,7 +281,7 @@
         width: 400px;
     }
 
-    .com_head a{color:#3f84f6;float:right;margin-right:40px;font-size: 14px;}
+    .com_head a{color:#fff;float:right;margin-right:40px;font-size: 14px;}
     .com_head a i{margin-left: 5px;line-height: 40px;}
     .com_head a:hover{color: #d2272d;}
 
@@ -439,7 +439,7 @@
                     </div>
                     <div class="col-xs-12" ng-show="tender.ifOpen == 0">
                         <a class="add-vendor tender-desc" ng-click="dbfindVendor()" href="javascript:void(0)">
-                            <i class="fa fa-plus-square"></i>添加供应商&nbsp;
+                            <i class="fa fa-plus-square fa-fw"></i>添加供应商&nbsp;
                         </a>
                     </div>
                     <div class="col-xs-12" style="" ng-repeat="en in tenderProd.enterpriseBaseInfo" ng-show="tender.ifOpen == 0">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/open_tender_list.html

@@ -302,7 +302,7 @@
                                      ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
 								<option value="">请选择收货地址</option>
 							</select>
-                            <a href="javascript:void(0);" class="add-address">+新增收货信息</a>
+                            <a href="javascript:void(0);" class="add-address"><i class="fa fa-plus-square fa-fw"></i>新增收货信息</a>
                         </span>
                         &lt;!&ndash;<span style="border-bottom: 1px solid #323232;"></span>&ndash;&gt;
                         &lt;!&ndash;<div class="input-group address-group">&ndash;&gt;

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/tender.html

@@ -178,7 +178,7 @@
         border: none;
     }
 
-    .com_head a{color:#3f84f6;float:right;margin-right:40px;font-size: 14px;}
+    .com_head a{color:#fff;float:right;margin-right:40px;font-size: 14px;}
     .com_head a i{margin-left: 5px;line-height: 40px;}
     .com_head a:hover{color: #d2272d;}
 

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/tender_question_detail.html

@@ -164,7 +164,7 @@
         border: none;
     }
 
-    .com_head a{color:#3f84f6;float:right;margin-right:40px;font-size: 14px;}
+    .com_head a{color:#fff;float:right;margin-right:40px;font-size: 14px;}
     .com_head a i{margin-left: 5px;line-height: 40px;}
     .com_head a:hover{color: #d2272d;}
 

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/vendor_tender.html

@@ -163,7 +163,7 @@
         border-radius: 0;
         border: none;
     }
-    .com_head a{color:#3f84f6;float:right;margin-right:40px;font-size: 14px;}
+    .com_head a{color:#fff;float:right;margin-right:40px;font-size: 14px;}
     .com_head a i{margin-left: 5px;line-height: 40px;}
     .com_head a:hover{color: #d2272d;}