Browse Source

弹框搜索功能样式调整

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7918 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 9 years ago
parent
commit
4a2b11ce8c

+ 24 - 0
src/main/webapp/resources/css/index.css

@@ -2741,4 +2741,28 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 #order-detail-list .text-inverse{
 #order-detail-list .text-inverse{
 	width: 100%;
 	width: 100%;
 	display: inline-block;
 	display: inline-block;
+}
+/*弹框搜索*/
+#window-search .form-control{
+	height: 36px;
+	line-height: 36px;
+	border: #327ebe 1px solid;
+	border-radius: 0px;
+	font-size: 14px;
+}
+#window-search .input-group-addon{
+	width: 70px;
+	height: 36px;
+	display: inline-block;
+	background: #327ebe;
+	font-size: 16px;
+	text-align: center;
+	line-height: 36px;
+	color: #fff !important;
+	padding: 0;
+	border: none;
+	border-radius: 0;
+	position: absolute;
+	top: 0;
+	right: 0;
 }
 }

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

@@ -78,7 +78,6 @@
 </style>
 </style>
 <div class="wrap">
 <div class="wrap">
 	<div class="content">
 	<div class="content">
-		<div class="com_title">服务>销售模块<font>>产品资料</font></div>
 		<div class="com_head"><span>产品资料</span><span class="fr"><em>录入人:{{user.userName}}</em><time>日期:{{time}}</time></span></div>
 		<div class="com_head"><span>产品资料</span><span class="fr"><em>录入人:{{user.userName}}</em><time>日期:{{time}}</time></span></div>
 		<!--产品资料新增-->
 		<!--产品资料新增-->
         <div class="pro-add-tab pro-add-data clearfix">
         <div class="pro-add-tab pro-add-data clearfix">

+ 2 - 2
src/main/webapp/resources/tpl/index/home/pagingRelease.html

@@ -100,11 +100,11 @@
         text-align: center;
         text-align: center;
     }
     }
 
 
-    .footer-click {
+  /*  .footer-click {
         width: 200px;
         width: 200px;
         position: relative;
         position: relative;
         top: -40px;
         top: -40px;
-    }
+    }*/
     #notice-list .table{
     #notice-list .table{
         border-top: #e8e8e8 1px solid;
         border-top: #e8e8e8 1px solid;
         border-left: #e8e8e8 1px solid;
         border-left: #e8e8e8 1px solid;

+ 3 - 2
src/main/webapp/resources/tpl/index/purc/modal/purc_order_vendor.html

@@ -26,11 +26,12 @@
 		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>采购订单 - 选择供应商</span>
 		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>采购订单 - 选择供应商</span>
 	</div>
 	</div>
 	<form class="form-horizontal">
 	<form class="form-horizontal">
-		<div class="form-group">
-			<label class="col-md-2 col-sm-2 control-label">筛选:</label>
+		<div class="form-group" id="window-search">
+			<div class="col-md-2 col-sm-2"></div>
 			<div class="col-md-8 col-sm-8">
 			<div class="col-md-8 col-sm-8">
 				<input type="text" class="form-control input-sm"
 				<input type="text" class="form-control input-sm"
 					required placeholder="输入供应商名称关键字查询" autofocus ng-model="keyword" ng-search="onSearch(keyword)">
 					required placeholder="输入供应商名称关键字查询" autofocus ng-model="keyword" ng-search="onSearch(keyword)">
+				<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
 			</div>
 			</div>
 		</div>
 		</div>
 	</form>
 	</form>

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

@@ -44,6 +44,33 @@
 #customer-tab tbody tr:hover{
 #customer-tab tbody tr:hover{
 	border: #d32526 1px solid;
 	border: #d32526 1px solid;
 }
 }
+#customer-tab .form-horizontal .form-control{
+	height: 36px;
+	line-height: 36px;
+	border: #327ebe 1px solid;
+	border-radius: 0px;
+	font-size: 14px;
+}
+#customer-tab .form-horizontal .form-group{
+	margin: 0;
+	padding: 10px 0;
+}
+#customer-tab .form-horizontal .form-group .input-group-addon{
+	width: 70px;
+	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: 10px;
+	right: 0;
+}
 </style>
 </style>
 <div class="loading in" ng-class="{'in': loading}">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 	<i></i>
@@ -57,10 +84,11 @@
 	</div>
 	</div>
 	<form class="form-horizontal">
 	<form class="form-horizontal">
 		<div class="form-group">
 		<div class="form-group">
-			<div class="col-md-8 col-sm-8">
+			<div class="col-md-6 col-sm-6"></div>
+			<div class="col-md-6 col-sm-6">
 				<div class="form-group form-group-sm has-feedback">
 				<div class="form-group form-group-sm has-feedback">
 					<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称或申请人搜索" />
 					<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称或申请人搜索" />
-               	 	<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+               	 	<a class="btn  input-group-addon" ng-click="onSearch()">搜索</a>
                 </div>
                 </div>
 			</div>
 			</div>
 		</div>
 		</div>

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

@@ -3,8 +3,8 @@
 		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>主动报价 - 选择客户</span>
 		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>主动报价 - 选择客户</span>
 	</div>
 	</div>
 	<form class="form-horizontal">
 	<form class="form-horizontal">
-		<div class="form-group">
-			<label class="col-md-2 col-sm-2 control-label">筛选:</label>
+		<div class="form-group" id="window-search">
+			<div class="col-md-2 col-sm-2"></div>
 			<div class="col-md-8 col-sm-8">
 			<div class="col-md-8 col-sm-8">
 				<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称或申请人搜索" />
 				<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称或申请人搜索" />
                	 	<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
                	 	<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>

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

@@ -3,11 +3,12 @@
 		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>主动报价 - 选择客户物料</span>
 		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>主动报价 - 选择客户物料</span>
 	</div>
 	</div>
 	<form class="form-horizontal">
 	<form class="form-horizontal">
-		<div class="form-group">
-			<label class="col-md-2 col-sm-2 control-label">筛选:</label>
+		<div class="form-group" id="window-search">
+			<div class="col-md-2 col-sm-2"></div>
 			<div class="col-md-8 col-sm-8">
 			<div class="col-md-8 col-sm-8">
 				<input ng-model="keyword" type="text" class="form-control input-sm" 
 				<input ng-model="keyword" type="text" class="form-control input-sm" 
 					required placeholder="输入客户物料关键字查询" autofocus ng-search="onSearch()">
 					required placeholder="输入客户物料关键字查询" autofocus ng-search="onSearch()">
+				<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
 			</div>
 			</div>
 		</div>
 		</div>
 	</form>
 	</form>