处理供应商与客户资料优化

src/main/webapp/resources/js/common/services.js

@@ -366,11 +366,11 @@ define(['angular', 'toaster', 'big'], function(angular, big) {
             },
             findUsers: {
                 url: 'account/user/customer/:id',
-                method: 'GET',
+                method: 'GET'
             },
             findSaleUsers: {
                 url: 'vendorDistribute/:id',
-                method: 'GET',
+                method: 'GET'
             },
             addSaleUserToVendor: {
                 url: 'vendorDistribute/bindVendor/:id',

src/main/webapp/resources/tpl/index/account/add_userInfo.html

@@ -1,19 +1,9 @@
 <style>
 	#user-lists{
-		max-height: 600px;
+		max-height: 575px;
 		overflow-x: hidden;
 		overflow-y: scroll;
 	}
-	@media screen and (max-width: 1366px){
-		#user-lists{
-			max-height: 368px;
-		}
-	}
-	@media screen and (max-width: 1600px){
-		#user-lists{
-			max-height: 480px;
-		}
-	}
 </style>
 <div class="loading in" ng-class="{'in': loading}">
 	<!--<i></i>-->
@@ -28,7 +18,7 @@
 </div>
 <div class="form-group" id="window-search" style="height: 36px; margin-bottom: 0; margin-top: 5px;">
 	<div class="col-sm-12">
-		<input type="text" class="form-control input-sm ng-pristine ng-invalid ng-invalid-required ng-touched" required="" placeholder="输入用户名关键词搜索" autofocus="" ng-model="keyword" ng-search="onSearch(keyword)" />
+		<input type="text" class="form-control input-sm ng-pristine ng-invalid ng-invalid-required ng-touched" required="" placeholder="输入用户电话和用户名关键词搜索" autofocus="" ng-model="keyword" ng-search="onSearch(keyword)" />
 		<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
 	</div>
 </div>

src/main/webapp/resources/tpl/index/account/transfer_userInfo.html

@@ -1,19 +1,9 @@
 <style>
 	#user-lists{
-		max-height: 600px;
+		max-height: 575px;
 		overflow-x: hidden;
 		overflow-y: scroll;
 	}
-	@media screen and (max-width: 1366px){
-		#user-lists{
-			max-height: 368px;
-		}
-	}
-	@media screen and (max-width: 1600px){
-		#user-lists{
-			max-height: 480px;
-		}
-	}
 </style>
 <div class="modal-header">
 	<h3 class="modal-title">
@@ -22,7 +12,7 @@
 </div>
 <div class="form-group" id="window-search" style="height: 36px; margin-bottom: 0; margin-top: 5px;">
 	<div class="col-sm-12">
-		<input type="text" class="form-control input-sm ng-pristine ng-invalid ng-invalid-required ng-touched" required="" placeholder="输入用户名关键词搜索" autofocus="" ng-model="keyword" ng-search="onSearch(keyword)" />
+		<input type="text" class="form-control input-sm ng-pristine ng-invalid ng-invalid-required ng-touched" required="" placeholder="输入用户电话和用户名关键词搜索" autofocus="" ng-model="keyword" ng-search="onSearch(keyword)" />
 		<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
 	</div>
 </div>

src/main/webapp/resources/tpl/index/baseInfo/modal/quotation_modal.html

@@ -172,7 +172,7 @@
             <div class="form-group">
                 <label for="inputEmail4" class="col-xs-4 control-label">税率（%）</label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail4" placeholder="税率（数字）" ng-model="inquiryItem.taxrate" ng-pattern="/^((\d|[123456789]\d)(\.\d+)?)$/">
+                    <input type="text" class="form-control" id="inputEmail4" placeholder="税率（数字）" ng-model="inquiryItem.taxrate" ng-pattern="/^(\d|[123456789]\d)$/">
                 </div>
             </div>
         </div>