主动报价弹框

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

@@ -145,19 +145,19 @@
 .b2b-operate-modal #user-lists {
     padding: 0 30px;
 }
-.b2b-operate-modal #user-lists table thead tr {
+table.b2b-modal-table thead tr {
     height: 34px;
     line-height: 34px;
     padding: 0;
     background: #89aefa;
 }
-.b2b-operate-modal #user-lists table thead tr th {
+table.b2b-modal-table thead tr th {
     color: #fff;
     font-weight: normal;
     font-size: 14px;
     text-align: center;
 }
-.b2b-operate-modal #user-lists table tbody tr {
+table.b2b-modal-table tbody tr {
     height: 40px;
     line-height: 40px;
     text-align: center;
@@ -165,10 +165,10 @@
     border-right: 1px solid #ecf0fb;
     border-bottom: 1px solid #ecf0fb;
 }
-.b2b-operate-modal #user-lists table tbody tr:hover {
+table.b2b-modal-table tbody tr:hover {
     background: #f9fafd;
 }
-.b2b-operate-modal #user-lists table tbody tr td {
+table.b2b-modal-table tbody tr td {
     font-size: 14px;
     border: none;
 }
@@ -195,4 +195,4 @@
     position: absolute;
     left: 0;
     top: 22px;
-}
+}

src/main/webapp/resources/css/common.css

@@ -1382,4 +1382,7 @@ select {
 
 i.must {
 	color: #ff0000;
+}
+.text-align-center {
+	text-align: center !important;
 }

src/main/webapp/resources/css/commonComponent.css

@@ -172,11 +172,11 @@ i.fa-minus-circle{
 
 /*---------------------标准控件-单选框start---------------------*/
 /** html代码
-    <label class="com-check-radio">
-        <input type="radio" id="effect" name="radio">
-        <label for="effect"></label>
-        生效
-    </label>
+        <label class="com-check-radio">
+            <input type="radio" id="effect" name="radio">
+            <label for="effect"></label>
+            生效
+        </label>
     <label class="com-check-radio">
         <input type="radio" id="no-effect" name="radio" checked="checked">
         <label for="no-effect"></label>

src/main/webapp/resources/view/vendor/b2b/modal/add_userInfo.html

@@ -29,7 +29,7 @@
 		</div>
 	</div>
 	<div class="modal-body" id="user-lists">
-		<table class="table">
+		<table class="table b2b-modal-table">
 			<thead>
 			<th width="80px;">用户UU</th>
 			<th width="100px;">用户名称</th>

src/main/webapp/resources/view/vendor/b2b/modal/quotation_new_cust.html

@@ -3,22 +3,24 @@
 		max-height: 500px;
 		overflow-y: auto;
 	}
+	.quot_new_cust .modal-footer {
+		text-align: center;
+	}
 </style>
-<div class="b2b-com-modal b2b-operate-modal">
+<div class="b2b-com-modal b2b-operate-modal quot_new_cust">
 	<p class="title">
 		主动报价 - 选择客户 <i class="fa fa-close" ng-click="cancel()"></i>
 	</p>
 	<div class="modal-body" style="min-height: 500px; padding-top: 0;">
 		<form class="form-horizontal">
-			<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="form-group" style="margin-top: 15px;" id="window-search">
+				<div class="col-md-12 col-sm-12 text-center">
 					<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>
 				</div>
 			</div>
 		</form>
-		<table class="block table table-default table-striped table-bordered"
+		<table class="table b2b-modal-table"
 			   ng-table="tableParams">
 			<thead>
 			<tr class="header">
@@ -39,6 +41,6 @@
 		</table>
 	</div>
 	<div class="modal-footer">
-		<button class="btn btn-default" ng-click="cancel()" type="button">取消</button>
+		<button class="b2b-btn b2b-btn-cancel" ng-click="cancel()" type="button">取消</button>
 	</div>
 </div>

src/main/webapp/resources/view/vendor/b2b/modal/quotation_new_custProd.html

@@ -4,26 +4,21 @@
 		overflow-y: auto;
 	}
 </style>
-<div class=""></div>
-<div class="modal-body" style="min-height: 500px; padding-top: 0;">
-	<div class="modal-header" style="margin-bottom: 10px;">
-		<h3 class="modal-title">
-			<span>主动报价 - 选择客户物料</span>
-		</h3>
-	</div>
-	<form class="form-horizontal">
-		<div class="form-group" id="window-search">
-			<div class="col-md-2 col-sm-2"></div>
-			<div class="col-md-8 col-sm-8">
-				<input ng-model="keyword" type="text" class="form-control input-sm" 
-					required placeholder="输入客户物料关键字查询" autofocus ng-search="onSearch()">
-				<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+<div class="b2b-com-modal b2b-operate-modal quot_new_custProd">
+	<p class="title">主动报价 - 选择客户物料 <i class="fa fa-close" ng-click="cancel()"></i></p>
+	<div class="modal-body clearfix" style="min-height: 500px; padding-top: 0;">
+		<form class="form-horizontal">
+			<div class="form-group" style="margin-top: 15px;" id="window-search">
+				<div class="col-md-12 col-sm-12 text-center">
+					<input ng-model="keyword" type="text" class="form-control input-sm"
+						   required placeholder="输入客户物料关键字查询" autofocus ng-search="onSearch()">
+					<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+				</div>
 			</div>
-		</div>
-	</form>
-	<table class="block table table-default table-striped table-bordered"
-		ng-table="tableParams">
-		<thead>
+		</form>
+		<table class="table b2b-modal-table"
+			   ng-table="tableParams">
+			<thead>
 			<tr class="header">
 				<th width="160px">编号</th>
 				<th width="160px">名称</th>
@@ -31,8 +26,8 @@
 				<th width="80px">单位</th>
 				<th width="50px">选择</th>
 			</tr>
-		</thead>
-		<tbody>
+			</thead>
+			<tbody>
 			<tr ng-repeat="product in $data">
 				<td class="text-center"><a ng-click="check(product)" ng-bind="::product.code"></a></td>
 				<td class="text-center"><a ng-click="check(product)" ng-bind="::product.title"></a></td>
@@ -40,9 +35,10 @@
 				<td class="text-center"><a ng-click="check(product)" ng-bind="::product.unit"></a></td>
 				<td class="text-center"><a title="选择" href="javascript:void(0)" ng-click="check(product)">选择</a></td>
 			</tr>
-		</tbody>
-	</table>
-</div>
-<div class="modal-footer">
-	<button class="btn btn-default" ng-click="cancel()" type="button">取消</button>
+			</tbody>
+		</table>
+	</div>
+	<div class="modal-footer text-align-center">
+		<button class="b2b-btn b2b-btn-cancel" ng-click="cancel()" type="button">取消</button>
+	</div>
 </div>

src/main/webapp/resources/view/vendor/b2b/modal/transfer_userInfo.html

@@ -29,7 +29,7 @@
 		</div>
 	</div>
 	<div class="modal-body" id="user-lists">
-		<table class="table">
+		<table class="table b2b-modal-table">
 			<thead>
 			<th width="80px;">用户UU</th>
 			<th width="100px;">用户名称</th>

src/main/webapp/resources/view/vendor/b2b/sale/quotation_new.html

@@ -45,7 +45,7 @@
 	.input-group-addon {
 		background-color: inherit;
 		border: 1px solid #e1e1e1;
-		color: #888 !important;
+		color: #888;
 	}
 
 	.status {