个人信息、采购询价页面修改样式。

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

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

@@ -652,7 +652,7 @@ input:focus, select:focus {
     width: 100%;
     height: 90px;
     margin: 0 auto;
-    border-bottom: #d0cfcf 1px solid;
+    /*border-bottom: #d0cfcf 1px solid;*/
     overflow: hidden;
 }
 

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

@@ -86,28 +86,101 @@
 	-moz-transition: all 0s ease-in-out;
 	transition: all 0s ease-in-out;
 }
+.com_head {
+	width: 100%;
+	height: 40px;
+	line-height: 44px;
+	background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
+	background-color: #f5f5f5;
+	background-size: 100% 100%;
+}
+
+.com_head span {
+	margin-left: 30px;
+	color: #000;
+	font-size: 14px;
+}
+.title-div .pull-right{
+	float: right;
+	margin-right: 15px;
+	font-weight: normal;
+}
+.title-div .pull-right a{
+	font-weight: normal;
+	font-size: 14px;
+	color: #5078cb;
+}
+.pane{
+	box-shadow: none;
+	margin-bottom: 0;
+}
+.base-info{
+	border-bottom: #e8e8e8 1px solid;
+}
+.pane .pane-body{
+		font-size: 14px;
+		padding: 15px;
+	}
+	#order-detail-list{
+		padding: 0;
+	}
+#order-detail-list .table-default .header th{
+	color: #323232;
+	font-weight: bold;
+	border-bottom: #e8e8e8 1px solid;
+}
+#order-detail-list .table>tbody+tbody{
+	border-top: none;
+}
+#order-detail-list .table-default td{
+	border-bottom: #e8e8e8 1px solid;
+	border-top: none;
+}
+#order-detail-list .table-default td i{
+	color: #5078cb;
+}
+#order-detail-list tbody tr{
+	height: 60px;
+}
+.row-operator>.operator-menu a:hover{
+	color: #fff;
+}
+.title-div .row-operator2 ul li a{
+	color: #fff;
+}
+.title-div .row-operator2 ul li a:hover{
+	color: #fff;
+}
+.base-info .title{
+	font-weight: normal;
+	color: #323232;
+}
+.base-info .content{
+	color: #969595;
+}
 </style>
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div class="pane base-info">
-	<div class="pane-header">
-		我的个人资料
+	<div class="com_head"><span>人员信息</span></div>
+	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+		<span class="f14">我的个人资料</span>
 		<div class="pull-right">
 			<a ng-disabled="userForm.$invalid" class="text-simple text-success"
-				ng-show="editing" ng-click="saveUser()"><i
-				class="fa fa-save fa-fw"></i>保存修改</a> <a class="text-simple"
-				ng-show="editing" ng-click="editing=false"><i
+			   ng-show="editing" ng-click="saveUser()"><i
+					class="fa fa-save fa-fw"></i>保存修改</a> <a class="text-simple"
+															 ng-show="editing" ng-click="editing=false"><i
 				class="fa fa-reply-all fa-fw"></i>取消编辑</a> <a class="text-simple"
-				ng-show="!editing" ng-click="editing=true"><i
+															  ng-show="!editing" ng-click="editing=true"><i
 				class="fa fa-pencil fa-fw"></i>编辑</a> <a class="text-simple text-danger"
-				ng-click="updatePassword()"><i class="fa fa-lock fa-fw"></i>修改密码</a>
+														 ng-click="updatePassword()"><i class="fa fa-lock fa-fw"></i>修改密码</a>
 		</div>
 	</div>
-	<div class="pane-body">
+	<div class="pane-body" style="padding-left: 30px;">
 		<form ng="userForm" class="form-inline">
 			<div class="row row-sm item">
-				<div class="col-xs-3">
+				<div class="col-xs-4">
 					<span class="title">姓名</span>
 					<div class="content" ng-show="!editing" ng-bind="user.userName"></div>
 					<div class="content" ng-show="editing">
@@ -115,7 +188,7 @@
 							class="form-control input-sm" type="text" />
 					</div>
 				</div>
-				<div class="col-xs-3">
+				<div class="col-xs-4">
 					<span class="title">性别</span>
 					<div class="content" ng-show="!editing"
 						ng-bind="user.userSex == 'F' ? '女' : '男'"></div>
@@ -125,7 +198,7 @@
 							ng-model="user.userSex" value="M" type="radio" /> 男 </label>
 					</div>
 				</div>
-				<div class="col-xs-6">
+				<div class="col-xs-4">
 					<span class="title">身份证号</span>
 					<div class="content" ng-show="!editing" ng-bind="user.userIdcode"></div>
 					<div class="content" ng-show="editing">
@@ -135,11 +208,11 @@
 				</div>
 			</div>
 			<div class="row row-sm item">
-				<div class="col-xs-3">
+				<div class="col-xs-4">
 					<span class="title">UU</span>
 					<div class="content" ng-bind="::user.userUU"></div>
 				</div>
-				<div class="col-xs-3">
+				<div class="col-xs-4">
 					<span class="title">电话</span>
 					<div class="content" ng-show="!editing" ng-bind="user.userTel"></div>
 					<div class="content" ng-show="editing">
@@ -147,7 +220,7 @@
 							class="form-control input-sm" type="text" />
 					</div>
 				</div>
-				<div class="col-xs-6">
+				<div class="col-xs-4">
 					<span class="title">邮箱</span>
 					<div class="content" ng-show="!editing" ng-bind="user.userEmail"></div>
 					<div class="content" ng-show="editing">
@@ -160,15 +233,15 @@
 	</div>
 </div>
 <div class="pane base-info">
-	<div class="pane-header">
-		我的客户
+	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+		<span class="f14">我的客户</span>
 		<div class="pull-right">
 			共&nbsp;{{distributes.length}}&nbsp;客户
 		</div>
 	</div>
-	<div class="pane-body">
+	<div class="pane-body" id="order-detail-list">
 		<table class="block table table-default table-striped">
-			<tr class="header">
+			<tr class="header" style="height: 40px;">
 				<th width="90">UU</th>
 				<th width="120">企业名称</th>
 				<th width="80">简称</th>
@@ -225,18 +298,18 @@
 		</form>
     </script>
 <div class="pane base-info">
-	<div class="pane-header">
-		全部用户
+	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+		<span class="f14">我的客户</span>
 		<div class="pull-right" ng-show="user.sys">
 			<a title="新增用户默认密码为111111" ng-show="adding == true" class="btn btn-success btn-sm" ng-disabled="newUserForm.$invalid" ng-click="addUser(newUser)" class="text-simple">
-			 	<i class="fa fa-user-plus fa-fw"></i>
-			 	确定添加
-			</a> 
+				<i class="fa fa-user-plus fa-fw"></i>
+				确定添加
+			</a>
 			<a ng-click="adding = false" ng-show="adding == true" class="text-simple">
 				<i class="fa fa-user-plus fa-fw"></i>
 				取消
 			</a>
-			
+
 			<!-- 添加用户 start -->
 			<div class="row-operator2">
 				<a ng-show="adding != true" class="text-simple operator-trigger" href="javascript:void(0);">
@@ -249,10 +322,10 @@
 				</ul>
 			</div>
 			<!-- 添加用户 end -->
-			
+
 		</div>
 	</div>
-	<div class="pane-body">
+	<div class="pane-body" id="order-detail-list">
 		<form name="newUserForm">
 			<table class="block table table-default table-striped"
 				ng-table="tableParams">
@@ -264,7 +337,7 @@
 						<th width="170">身份证号</th>
 						<th width="170">电话</th>
 						<th width="200">邮箱</th>
-						<th width="70">客户分配</th>
+						<th width="100">客户分配</th>
 						<th colspan="2">角色</th>
 					</tr>
 				</thead>
@@ -328,8 +401,8 @@
 						<td class="row-operator">
 							<a class="operator-trigger" href="javascript:void(0);"><i class="fa fa-pencil fa-lg"></i></a>
 							<ul class="list-unstyle list-inline operator-menu">
-								<li><a ng-click="editUserRole(u)"><i class="fa fa-fw fa-pencil-square-o"></i>编辑</a></li>
-								<li><a ng-click="removeUser(u)" ng-if="u.userUU != user.userUU"><i class="fa fa-fw fa-trash-o"></i>删除</a></li>
+								<li><a ng-click="editUserRole(u)"><i class="fa fa-fw fa-pencil-square-o" style="color: #fff"></i>编辑</a></li>
+								<li><a ng-click="removeUser(u)" ng-if="u.userUU != user.userUU"><i class="fa fa-fw fa-trash-o" style="color: #fff"></i>删除</a></li>
 							</ul>
 						</td>
 					</tr>

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

@@ -19,6 +19,9 @@
         border: #bfbfbf 1px solid !important;
         width: 187px;
     }
+    .dropdown-menu tr td button{
+        border: none;
+    }
 </style>
 <body>
 <div class="wrap" id="pub">

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

@@ -273,6 +273,16 @@ margin-left: 55px;
 	font-size: 16px;
     font-family: "Microsoft YaHei", "微软雅黑";
 }
+.inquiry-cz{
+	font-size: 14px;
+	padding: 0;
+	margin-left: 55px;
+}
+.inquiry-cz a{
+	color: #5078cb;
+	float: left;
+	margin-left: 15px;
+}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">
@@ -281,7 +291,7 @@ margin-left: 55px;
 	</div>
 	<div class="menu condition block">
 		<div class="row">
-			<div class="col-xs-8">
+			<div class="col-xs-10">
 				<div class="btn-group btn-group-sm btn-group-justified">
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
@@ -300,9 +310,9 @@ margin-left: 55px;
 					</div>
 				</div>
 			</div>
-			<div class=" inquiry-todo col-xs-2 pull-right" style="padding-left: 0;">
-				<a id="add" ui-sref="purc.inquiry_unapply" title="待提交">待提交</a>
-				<a id="add" ui-sref="purc.inquiry_new" title="新增">新增</a>
+			<div class="inquiry-cz col-xs-1">
+				<a id="add" ui-sref="purc.inquiry_unapply" title="待提交"><img src="resources/img/icon/wait.png"/></a>
+				<a id="add" ui-sref="purc.inquiry_new" title="新增"><img src="resources/img/icon/add.png"/></a>
 			</div>
 		</div>
 	</div>

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

@@ -506,6 +506,9 @@ input[type="radio"], input[type="checkbox"] {
 	height:15px;
 	font-size:12px;
 }
+.tender-list02 .dropdown-menu tr td button{
+    border: none;
+}
 /*end*/
 /* 弹框 */
 .bomb-box {