Browse Source

产品管理人员搜索

yangc 7 years ago
parent
commit
86c549f972

+ 7 - 3
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -1269,16 +1269,20 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 		$scope.showSimilarUser = false;
 		$scope.similarUser = [];
 		$scope.onUserUUChange = function (prodName) {
-            Enterprise.findUsersByKeyword({page: 1, count: 8, keyword: prodName, enuu: $rootScope.userInfo.enterprise.uu }, function (page) {
-                if (page) {
+            Enterprise.findUserByUserNameLikeAndEnUU({page: 1, count: 8, userName: prodName, enuu: $rootScope.userInfo.enterprise.uu }, function (page) {
+                if (page.content && page.content.length) {
+					$scope.param.userUU = page.content[0]
                     $scope.similarUser = page;
                     $scope.showSimilarUser = true;
-                }
+                } else {
+					$scope.similarUser.content = [];
+				}
             })
         }
         $scope.setProdName = function (item) {
 			$scope.prodName = item.userName;
 			$scope.param.userUU = item.userUU;
+			$scope.showSimilarUser = false;
         }
 
 		var loadDataReload = function () {

+ 31 - 11
src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -177,19 +177,28 @@
 		margin-bottom: 16px;
 	}
 	.search-check .search{
-		width: 532px;
-		margin-left: 150px;
+		width: 628px;
+		margin-left: 52px;
 		position: relative;
 	}
 	.search-check .search .prodUserList {
 		position: absolute;
-		background: #aaa;
-		left: 0;
+		left: 29px;
 		top: 35px;
 		font-size: 14px;
+		width: 155px;
+		max-height: 200px;
+		color: #666;
+		box-shadow: 0px 1px 6px 1px #cccccc9e;
 	}
 	.search-check .search .prodUserList li {
-
+		height: 25px;
+		line-height: 25px;
+		text-align: center;
+		background: #fff;
+	}
+	.search-check .search .prodUserList li:hover {
+		background: #e8e8e8;
 	}
 	.search-check .search .form-control{
 		width: 340px;
@@ -199,10 +208,20 @@
 		box-shadow: none;
 		border-right: none;
 	}
-	.search-check .search .form-control:first-child {
-		width: 163px;
+	.search-check .search label {
+		position: absolute;
+		left: 5px;
+		font-size: 14px;
+		color: #666;
+		font-weight: normal;
+		height: 34px;
+		line-height: 34px;
+	}
+	.search-check .search .prod-name {
+		width: 183px;
+		padding: 0 5px 0 75px;
 	}
-	.search-check .search .form-control:nth-child(2) {
+	.search-check .search .keyword-material {
 		width: 260px;
 	}
 	.search-check .search button,.search-check .search a{
@@ -1630,13 +1649,14 @@
 		<div ng-if="standard_tab == 'unstandard' || standard_tab =='standard'">
 			<div class="search-check">
 				<div class="search fl">
-					<input type="text" class="form-control" ng-model="prodName" ng-change="onUserUUChange(prodName)" placeholder="UU号/姓名"/>
+					<label>人员选择:</label>
+					<input type="text" class="form-control prod-name" ng-model="prodName" ng-change="onUserUUChange(prodName)" placeholder="UU号/姓名"/>
 					<ul ng-if="showSimilarUser" class="prodUserList">
 						<li ng-repeat="item in similarUser.content" ng-click="setProdName(item)">
-							{{item.userName}}
+							{{item.userName}}({{item.userUU}})
 						</li>
 					</ul>
-					<input type="text" class="form-control" ng-model="param.keyword" ng-search="onSearch()" placeholder="类目/型号/品牌"/>
+					<input type="text" class="form-control keyword-material" ng-model="param.keyword" ng-search="onSearch()" placeholder="类目/型号/品牌"/>
 					<button ng-click="onSearch()">搜索</button>
 					<!--<a ng-click="download()">批量导出</a>-->
 				</div>