页面细节调整（小改动）

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7539 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/WEB-INF/views/normal/index.html

@@ -184,8 +184,6 @@
 					</div>
 				</div>
 				<div class="col-sm-4">
-					<p>
-					</p>
 					<p>
 						<a href="">关于深圳市优软科技有限公司</a>
 					</p>

src/main/webapp/resources/css/add.css

@@ -1473,7 +1473,7 @@ option {
 	width: 568px !important;
 	height: 34px;
 	border: #ccc 1px solid;
-	font-size: 16px;
+	font-size: 14px;
 	position: relative;
 	margin: 0px auto;
 	margin-top: 3px;
@@ -2182,9 +2182,23 @@ scale
 	border: none;
 }
 .area-select{
-	width: 207.6px;
+	width: 204px;
 	height: 34px;
 	padding-left: 10px;
 	border: #cccccd 1px solid;
 	font-size: 14px;
-}
+	float: left;
+	margin-left: 10px;
+}
+.area-select:first-child{
+	margin-left: 0 !important;
+}
+.area-select[size]{
+	z-index: 1000;
+	position: relative;
+}
+.area-select option{
+	width: 204px;
+	position: relative;
+	left: -10px;
+}

src/main/webapp/resources/css/deputyOrder/order.css

@@ -4,7 +4,6 @@ body {
 .warp {
     width:100%;
     margin:0px auto;
-    margin-top:20px;
 }
 .content {
     width: 1170px;

src/main/webapp/resources/css/index.css

@@ -1060,11 +1060,11 @@ ul>li.item-link>a {
 }
 
 .use>ul>li:hover,.left-nav>ul>li:hover,.left-nav>ul>li.active {
-	background-color: #56a022;
+	background-color: #6f6f6f;
 }
 
 .left-nav>ul>li.active {
-	background-color: #4b8b1e;
+	background-color: #6f6f6f;
 }
 
 .use>ul>li:hover *,.left-nav>ul>li:hover *,.left-nav>ul>li.active * {
@@ -1186,7 +1186,9 @@ ul>li.item-link>a {
 	border-bottom: 1px solid #e8e8e8;
 	display: inline-block;
 }
-
+.todo .todo-content a:hover{
+	color: #f40 !important;
+}
 .todo .todo-content #tips {
 	margin-top: 40px;
 	font-family: Microsoft YaHei, SimHei, Verdana; 
@@ -1269,7 +1271,7 @@ ul>li.item-link>a {
 }
 
 .pane {
-	margin-top: 20px;
+	/*margin-top: 20px;*/
 	margin-bottom: 15px;
 	background-color: #fff;
 }
@@ -1813,9 +1815,11 @@ ul>li.item-link>a {
 }
 
 .role-container>.role-list {
-	width: 930px;
+	width: 100%;
+}
+.role-container>.role-list:nth-child(1){
+	border-bottom: #e8e8e8 1px solid;
 }
-
 .role-container>.role-list:before,.role-container>.role-list:after {
 	display: table;
 	content: " ";
@@ -1824,12 +1828,13 @@ ul>li.item-link>a {
 
 .role-container>.role-list>.item {
 	float: left;
-	width: 306px;
+	width: 33%;
 	height: 150px;
-	padding: 10px 20px;
-	border-right: 1px dashed #ededed;
+	padding: 10px 25px;
+}
+.role-container>.role-list .desc h3 a{
+	font-size: 16px;
 }
-
 .role-container>.role-list>.item>.icon{
   	float: left;
   	width: 100px;
@@ -1846,7 +1851,7 @@ ul>li.item-link>a {
 }
 
 .role-container>.role-list>.item>.desc {
-	margin-left: 150px;
+	margin-left: 120px;
 }
 
 .userrole-list {
@@ -2545,7 +2550,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	line-height: 30px;
 	border-radius: 5px;
 	float: right;
-	bottom: 50px;
+	bottom: 40px;
 	position: relative;
 }
 .back-home:hover{
@@ -2554,4 +2559,21 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 }
 .data-wrap .todo{
 	margin-top: 0 !important;
+}
+#footer .col-sm-4 p{
+	font-size: 14px;
+	line-height: 25px;
+	padding: 0;
+	margin: 0;
+}
+#footer .col-sm-4{
+	margin-top: 30px;
+}
+/*所有hover边框颜色*/
+.sale-view .order-table>tbody:hover {
+	border-color: #d32526 !important;
+	border-width: 2px;
+}
+.modal-content{
+	margin-top: 90px;
 }

src/main/webapp/resources/tpl/index/approvalFlow/role.html

@@ -1,6 +1,40 @@
+<style>
+	.role-container{
+		padding: 0 15px 15px 15px;
+	}
+	.role-container .page-header{
+		height: 50px;
+		line-height: 50px;
+		padding: 0;
+		margin: 0;
+		border-bottom: #ccc 1px dotted;
+		font-size: 16px;
+	}
+	.role-container>.role-list>.item>.icon{
+			 color: #fff;
+		 }
+	.role-container>.role-list-bg01>.item:nth-child(1)>.icon{
+		background: #077bba;
+	}
+	.role-container>.role-list-bg01>.item:nth-child(2)>.icon{
+		background: #f87103;
+	}
+	.role-container>.role-list-bg01>.item:nth-child(3)>.icon{
+		background: #02c6c5;
+	}
+	.role-container>.role-list-bg01>.item:nth-child(4)>.icon{
+		background: #5078cb;
+	}
+	.role-container>.role-list-bg02>.item:nth-child(1)>.icon{
+		background: #c4bfb9;
+	}
+	.role-container>.role-list-bg02>.item:nth-child(1)>.icon i{
+		color: #fff;
+	}
+</style>
 <div class="block role-container">
 	<h1 class="page-header">默认角色</h1>
-	<div class="role-list">
+	<div class="role-list-bg01 role-list">
 		<div class="item" ng-repeat="role in roles.defaults track by role.id">
 			<a class="icon" ng-click="editRole(role)">
 				<i class="fa fa-user"
@@ -13,7 +47,7 @@
 		</div>
 	</div>
 	<h1 class="page-header">自定义角色</h1>
-	<div class="role-list">
+	<div class="role-list-bg02 role-list">
 		<div class="item" ng-repeat="role in roles.custom track by role.id">
 			<a class="icon" ng-click="editRole(role)">
 				<i class="fa fa-user"></i>

src/main/webapp/resources/tpl/index/baseInfo/enterpriseList.html

@@ -237,6 +237,25 @@
 	border: none;
 	font-size: 16px;
 	}
+.search-bg .input-group-addon{
+	width: 85px;
+	height: 36px;
+	display: inline-block;
+	background: #327ebe;
+	font-size: 16px;
+	text-align: center;
+	line-height: 36px;
+	color: #fff;
+	padding: 0;
+	border: none;
+	border-radius: 0;
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.search-bg .form-group{
+	position: relative;
+}
 </style>
 <div class="block" style="margin-left: -240px; width: 1100px;">
 <div class="loading in" ng-class="{'in': loading}">

src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

@@ -249,6 +249,25 @@
 	padding-top: 10px;
 	padding-bottom: 10px;
 }
+.search-bg .input-group-addon{
+	width: 85px;
+	height: 36px;
+	display: inline-block;
+	background: #327ebe;
+	font-size: 16px;
+	text-align: center;
+	line-height: 36px;
+	color: #fff;
+	padding: 0;
+	border: none;
+	border-radius: 0;
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.search-bg .form-group{
+	position: relative;
+}
 </style>
 <div class="block" style="margin-left: -240px; width: 1100px;">
 <div class="loading in" ng-class="{'in': loading}">

src/main/webapp/resources/tpl/index/baseInfo/prodList.html

@@ -149,13 +149,16 @@
                 <td colspan="5"></td>
             </tr>
             <tr class="toolbar toolbar-top">
-                <td colspan="6">
+                <td colspan="5">
                 </td>
                 <td class="text-center">
                     <a href="product/baseInfo/xls?keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
                 </td>
                 <td colspan="1" class="text-center">
-                    <a ui-sref="baseInfo.newProdInfo">新增 <i class="fa fa-lg fa-plus-square"></i></a>
+                    <a ui-sref="sale.newProdInfo">新增 <i class="fa fa-lg fa-plus-square"></i></a>
+                </td>
+                <td colspan="1" class="text-center">
+                    <a ui-sref="sale.uploadByBatch">批量导入 <i class="fa fa-file-excel-o"></i></a>
                 </td>
             </tr>
             <tr class="sep-row">

src/main/webapp/resources/tpl/index/baseInfo/uploadByBatch.html

@@ -8,7 +8,8 @@
 }
 
 .block {
-	padding: 0px 15px;
+	padding: 0 15px;
+	padding-bottom: 15px;
 }
 
 .headerline {
@@ -16,12 +17,13 @@
     font-family: Microsoft YaHei, SimHei, Verdana;
     font-weight: 500;
     line-height: 22px;
-    margin: 30px 0 35px -15px;
+    margin: 1px 0 35px -15px;
     clear: both;
     zoom: 1;
     border-top: 1px solid #eee;
     position: relative;
     font-size: 18px;
+	padding-bottom: 15px;
 }
 
 .headerline .index {

src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -1,6 +1,6 @@
 <style>
 .append{
-	color: green;font-size:13px; margin-left: 10px
+	color: #428bca;font-size:13px; margin-left: 10px
 }
 .order-table td {
 	padding-top: 10px;
@@ -76,7 +76,7 @@
 }
 
 .order-table td.status .operate-undo {
-	background: #339933;
+	background: #428bca;
 }
 
 .order-table td.status .operate-done {
@@ -136,7 +136,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-1">
+			<div class="col-xs-2">
 				<div class="text-default f14 total">
 					共 <span ng-bind="tableParams.total()" class="text-num"></span>
 				</div>

src/main/webapp/resources/tpl/index/fa/apCheckList.html

@@ -1,6 +1,6 @@
 <style>
 	.searchcolor {
-		background-color: #eff2f9;
+		background-color: #fff;
 		}
 		
 	.searchMargin { 

src/main/webapp/resources/tpl/index/purc/deputyOrder.html

@@ -2,10 +2,11 @@
     /* 顶部搜索框 */
     .top-nav {
         margin-bottom: 10px;
+        font-family: "Microsoft YaHei", "微软雅黑" !important;
     }
     .top-nav #search_input {
         height: 36px;
-        font-size: 16px;
+        font-size: 14px;
         font-family: '微软雅黑';
         border: 1px solid #327EBE;
         border-top-left-radius: 0;
@@ -65,7 +66,6 @@
         border-radius: 0;
         height: 40px;
         font-weight: 600;
-        font-family: "Microsoft Yahei Regular";
         padding: 0 20px 0 20px;
         border-bottom: 2px solid #fff;
     }
@@ -97,14 +97,13 @@
         height: 50px;
         background-color: #fff;
         color: rgb(50,50,50);
-        font-family: "Microsoft Yahei Regular";
         border-bottom: 1px solid #e8e8e8;
     }
     .tender-table .header>th {
         text-align: center;
+        font-weight: 600;
     }
     .tender-table>tbody {
-        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
         color: #323232;
         border: 1px solid transparent;
@@ -117,7 +116,6 @@
 
     }
     .tender-table tbody tr td a {
-        font-family: "Microsoft Yahei Regular";
         color: #327ebe;
     }
 	.tender-table tbody>tr{
@@ -142,12 +140,19 @@
     .main-content>table>tbody:hover .operates-status {
         display: none;
     }
+    .main-content  .btn-group{
+        font-family: "Microsoft YaHei", "微软雅黑";
+        font-weight: 500;
+    }
+    .main-content  .btn-group button{
+        font-weight: inherit;
+    }
 </style>
 <div>
     <!-- 顶部导航及搜索框 -->
     <div class="top-nav">
         <div class="col-xs-8" style="font-size: 14px; height: 36px; padding-top: 10px;">
-            <span style="font-family: 'Microsoft Yahei Regular'; font-weight: 600; color: rgb(0,0,0);">服务>采购模块></span><span style="color: #327EBE;">代采订单</span>
+            <span>服务>采购模块></span><span style="color: #327EBE;">代采订单</span>
         </div>
         <div class="input-group search-group col-xs-4">
             <input id="search_input" type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入订单号、公司名、姓名查询" />

src/main/webapp/resources/tpl/index/purc/tender.html

@@ -8,7 +8,6 @@
         margin-right: 10px;
         background: linear-gradient(to top, #e7e7e7 0%,#ffffff 100%);
         height: 40px;
-        margin-top: 20px;
         line-height: 40px;
         box-shadow: 0 0 5px #6f6f6f;
         border-top-right-radius: 20px;
@@ -16,8 +15,8 @@
     /* 主体 */
     .purc-tender {
         line-height: 2;
-        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
+        font-family: "Microsoft YaHei", "微软雅黑";
     }
     .purc-tender .row {
         margin-left: 0px;
@@ -35,7 +34,6 @@
     }
     /* 二级标题栏 */
     .title-div {
-        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
         font-weight: 600;
         padding-left: 30px;
@@ -206,10 +204,12 @@
         width: 94px;
         height: 36px;
         font-size: 14px;
-        font-family: "Microsoft Yahei Regular";
         color: #fff;
         border-radius: 0;
     }
+    .tender-content>div>div>button:hover{
+        background: #5078cb;
+    }
     .tender-content>div>div.btn-publish>button {
         background-color: #327EBE;
     }

src/main/webapp/resources/tpl/index/purc/tenderlist.html

@@ -5,7 +5,7 @@
     }
     .top-nav #search_input {
         height: 36px;
-        font-size: 16px;
+        font-size: 14px;
         font-family: '微软雅黑';
         border: 1px solid #327EBE;
         border-top-left-radius: 0;
@@ -65,7 +65,6 @@
         border-radius: 0;
         height: 40px;
         font-weight: 600;
-        font-family: "Microsoft Yahei Regular";
         padding: 0 20px 0 20px;
         border-bottom: 2px solid #fff;
     }
@@ -97,14 +96,12 @@
         height: 50px;
         background-color: #fff;
         color: rgb(50,50,50);
-        font-family: "Microsoft Yahei Regular";
         border-bottom: 1px solid #969595;
     }
     .tender-table .header>th {
         text-align: center;
     }
     .tender-table>tbody {
-        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
         color: #323232;
         border: 1px solid transparent;
@@ -117,16 +114,21 @@
 
     }
     .tender-table tbody tr td a {
-        font-family: "Microsoft Yahei Regular";
         color: #327ebe;
     }
-
+   .main-content  .btn-group{
+       font-family: "Microsoft YaHei", "微软雅黑";
+       font-weight: 500;
+   }
+    .main-content  .btn-group button{
+        font-weight: inherit;
+    }
 </style>
 <div ng-controller="PurcTenderCtrl">
     <!-- 顶部导航及搜索框 -->
     <div class="top-nav">
         <div class="col-xs-8" style="font-size: 14px; height: 36px; padding-top: 10px;">
-            <span style="font-family: 'Microsoft Yahei Regular'; font-weight: 600; color: rgb(0,0,0);">服务>采购模块></span><span style="color: #327EBE;">招标</span>
+            <span>服务>采购模块></span><span style="color: #327EBE;">招标</span>
         </div>
         <div class="input-group search-group col-xs-4">
             <input id="search_input" type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入招标信息" />

src/main/webapp/resources/tpl/index/qc/MRB.html

@@ -59,7 +59,7 @@
 
 .order-table>tbody {
 	border: 1px solid transparent;
-	border-top: 2px solid #56a022; 
+	border-top: 2px solid #e8e8e8;
 }
 
 .order-table>tbody:hover {

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -62,7 +62,7 @@
 }
 
 .order-table>tbody:hover {
-	border-color: #56a022;
+	border-color: #d32526;
 	border-width: 2px;
 }
 

src/main/webapp/resources/tpl/index/sale/inquiry_mould.html

@@ -62,7 +62,7 @@
 }
 
 .order-table>tbody:hover {
-	border-color: #56a022;
+	border-color: #d32526;
 	border-width: 2px;
 }
 

src/main/webapp/resources/tpl/index/search/search_result.html

@@ -177,6 +177,16 @@
 .enterprise-table tbody em {
  	background-color: red;
 }
+.enterprise-table .enterprise-bd .product{
+	font-size: 14px;
+}
+.enterprise-table  .pull-right .btn{
+	margin-top: 15px;
+	margin-right: 55px;
+}
+.enterprise-table .text-muted{
+	text-align: center;
+}
 </style>
 <div class="block" style="margin-left: -240px; width: 1100px;">
 	<div class="tip-body">
@@ -267,7 +277,7 @@
 					<span ng-bind-html="prod.enName| getkey:tip" ></span>
 				</td>
 				<td width="200" class="text-center"></td>
-				<td width="220" class="text-muted">
+				<td width="220" class="text-center text-muted">
 					<span ng-if="prod.isPartner==104" class="pull-right">当前企业还不是您的合作伙伴</span>
 					<span ng-if="prod.isPartner==107">等待处理</span>
 					<span ng-if="prod.isPartner==101">供应商</span>