新增企业产品库 物料编辑与查看

src/main/webapp/resources/js/common/query/material.js

@@ -115,7 +115,13 @@ define([ 'ngResource' ], function() {
             batchPutOn: {
                 url: 'trade/products/batch',
                 method: 'PUT'
-            }
+            },
+            //根据物料id获取替换物料列表
+            getGoodsListByProductId : {
+                url: 'trade/products/:id/replaces',
+                method: 'GET',
+                isArray: true
+            },
         });
     }]);
 });

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -2931,25 +2931,27 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
       if (material) {
         $scope.editCmp = material.pcmpcode;
         $scope.editBrand = material.pbranden;
-        $scope.replaceMaterialList = angular.copy(material.productReplaceList || []);
-        $scope.replaceMaterialId = material.id;
-        for (var i = 0; i < $scope.replaceMaterialList.length; i++) {
-          $scope.errorObj.push({
-            code: 0,
-            brand: 0
-          });
-          $scope.isInCodeList.push(false);
-          $scope.isInBrandList.push(false);
-        }
-        if ($scope.replaceMaterialList.length == 0) {
-          $scope.replaceMaterialList = [{detno : 1, productId : material.id}];
-          $scope.errorObj = [{
-            code: 0,
-            brand: 0
-          }];
-          $scope.isInCodeList = [false];
-          $scope.isInBrandList = [false];
-        }
+        Material.getGoodsListByProductId({id: material.id}, function(data) {
+					$scope.replaceMaterialList = angular.copy(data || []);
+					$scope.replaceMaterialId = material.id;
+					for (var i = 0; i < $scope.replaceMaterialList.length; i++) {
+						$scope.errorObj.push({
+							code: 0,
+							brand: 0
+						});
+						$scope.isInCodeList.push(false);
+						$scope.isInBrandList.push(false);
+					}
+					if ($scope.replaceMaterialList.length == 0) {
+						$scope.replaceMaterialList = [{detno : 1, productId : material.id}];
+						$scope.errorObj = [{
+							code: 0,
+							brand: 0
+						}];
+						$scope.isInCodeList = [false];
+						$scope.isInBrandList = [false];
+					}
+				})
       } else {
         $scope.errorObj = [{
           code: 0,
@@ -3121,16 +3123,25 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
     $scope.setShowActive = -1;
     $scope.lookCmp = '';
     $scope.lookBrand = ''
-		$scope.resultDatalist = [{},{},{},{},{},{},{},{}]
-
+		$scope.resultDatalist = []
+		$scope._material = {}
 		$scope.LookShowReminfo = false
 		// 查看弹窗
 		$scope.lookActiveIndex = function (index, material) {
 
       $scope.setShowActive = index;
       if(!material){ return false}
+      $scope._material = material
       $scope.lookCmp = material.pcmpcode;
       $scope.lookBrand = material.pbranden;
+      Material.getGoodsListByProductId({id: material.id}, function(data) {
+        $scope.resultDatalist = data
+      })
+		}
+		//编辑按钮
+    $scope.updateIndex = function() {
+      $scope.setActiveIndex($scope.setShowActive, $scope._material)
+      $scope.setShowActive = -1;
 		}
 
 	}]);

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -2485,26 +2485,28 @@
       <div>品牌：<span>{{lookBrand}}</span></div>
       <i class="fa fa-close" ng-click="lookActiveIndex(-1)"></i>
     </div>
-    <div class="content">
+    <div class="content content3">
       <div class="content-line content-line2">
         <div class="leftline"></div>
         <p class="toptitle">可替代型号：</p>
         <div class="rightline"></div>
       </div>
-      <div class="content_top">
+			<div class="no-resulte" ng-if="resultDatalist.length == 0">暂无可替代型号，赶快去<a ng-click="updateIndex()">编辑</a>吧</div>
+      <div class="content_top" ng-if="resultDatalist.length > 0">
         <div class="content_toptitle">型号</div>
         <div class="content_toptitle">品牌</div>
         <div class="line"></div>
       </div>
-      <ul>
+      <ul ng-if="resultDatalist.length > 0">
         <li ng-repeat="list in resultDatalist">
           <div class="sort">{{$index+1}}</div>
-          <div class="text">HANAK-56023PN</div>
-          <div class="text">HANAK-56023PN</div>
+          <div class="text">{{list.ptrCmpcode}}</div>
+          <div class="text">{{list.ptrBranden}}</div>
         </li>
       </ul>
     </div>
-		<div class="reminfo" style="background: #fff;text-align: right;margin: 0px;padding-right: 20px;padding-top:5px;padding-bottom: 10px">共<span style="color: #5078cb">{{resultDatalist.length}}</span>个可替代型号</div>
+
+		<div class="reminfo" style="background: #fff;text-align: right;margin: 0px;padding-right: 20px;padding-top:5px;padding-bottom: 10px" ng-if="resultDatalist.length > 0">共<span style="color: #5078cb">{{resultDatalist.length}}</span>个可替代型号</div>
     <div class="operate">
       <span ng-click="lookActiveIndex(-1)" style="background: #5078cb">关闭</span>
     </div>
@@ -2682,38 +2684,49 @@
       left: 50%;
       top: 17px
     }
-    .edit-replace-box .content ul{
+    .edit-replace-box .content3 ul{
       margin: 0 20px;
       overflow-y: auto;
       max-height: 160px
     }
-    .edit-replace-box .content ul li {
+    .edit-replace-box .content3 ul li {
       height: 32px;
       line-height: 32px;
       color: #333333;
       font-size: 0;
     }
-    .edit-replace-box .content ul li:nth-child(odd){
+    .edit-replace-box .content3 ul li:nth-child(odd){
       background: #eef2fd
     }
-    .edit-replace-box .content ul li:nth-child(even) {
+    .edit-replace-box .content3 ul li:nth-child(even) {
       background: #f8f9fe
     }
-    .edit-replace-box .content ul li .text{
+    .edit-replace-box .content3 ul li .text{
       font-size: 14px;
       display: inline-block;
       width: 40%;
       text-align: center;
     }
-    .edit-replace-box .content ul li div:nth-child(3){
+    .edit-replace-box .content3 ul li div:nth-child(3){
       width: 50%;
     }
-    .edit-replace-box .content ul li .sort{
+    .edit-replace-box .content3 ul li .sort{
       font-size: 14px;
       display: inline-block;
       width: 10%;
       text-align: center;
     }
+	  .edit-replace-box .content3 .no-resulte {
+			text-align: center;
+			padding: 15px 0;
+			color: #666
+		}
+		.edit-replace-box .content3 .no-resulte a {
+			color: #5078cb
+		}
+		.edit-replace-box .content3 .no-resulte a:hover {
+			text-decoration: underline !important;
+		}
 </style>
 
 <!--

src/main/webapp/resources/view/vendor/forstore/vendor_material_person.html

@@ -2537,7 +2537,7 @@
                     <ul class="similar-list" ng-show="mate.showSimilarBrandList && similarBrand.length > 0 && mate.ptrBranden" ng-mouseenter="setIsInBrandList(true, key)" ng-mouseleave="setIsInBrandList(false, key)">
                         <li ng-repeat="sBrand in similarBrand" ng-bind="sBrand.nameEn" title="{{sBrand.nameEn}}" ng-click="setBrand(key, sBrand.nameEn)"></li>
                     </ul>
-                    <i class="fa fa-minus-circle" ng-if="replaceMaterialList.length >= 1" ng-click="setReplies('sub', key)"></i>
+                    <i class="fa fa-minus-circle" ng-if="replaceMaterialList.length > 1" ng-click="setReplies('sub', key)"></i>
 					<i class="fa fa-plus-circle" ng-if="replaceMaterialList.length -1 == key" ng-click="setReplies('add', key)"></i>
 				</div>
 			</div>