Browse Source

数据绑定

wangdy 8 years ago
parent
commit
17304a72c5

+ 5 - 0
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -363,8 +363,13 @@ public class ProductServiceImpl implements ProductService {
         if (CollectionUtils.isEmpty(productReplaceList)) {
             return false;
         }
+        Date date = new Date(System.currentTimeMillis());
         List<ProductReplace> productReplacesOld = productReplaceDao.findByUserUUAndProductId(SystemSession.getUser().getUserUU(),productReplaceList.get(0).getProductId());
         productReplaceDao.delete(productReplacesOld);
+        for (ProductReplace productReplace : productReplaceList) {
+            productReplace.setUserUU(SystemSession.getUser().getUserUU());
+            productReplace.setTime(date);
+        }
         productReplaceDao.save(productReplaceList);
         return true;
     }

+ 10 - 2
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialPersonCtrl.js

@@ -2459,9 +2459,17 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 
 		$scope.activeIndex = -1;
 
-		$scope.setActiveIndex = function (index) {
+		$scope.setActiveIndex = function (index,material) {
 			$scope.activeIndex = index;
-		}
+			if (material) {
+                $scope.editCmp = material.pcmpcode;
+                $scope.editBrand = material.pbranden;
+                $scope.replaceMaterialList = angular.copy(material.productReplaceList);
+                if ($scope.replaceMaterialList.length == 0) {
+                    $scope.replaceMaterialList = [{detno : 1, productId : material.id}]
+				}
+			}
+		};
 
 		$scope.replaceMaterialList = [
 			{

+ 7 - 7
src/main/webapp/resources/view/vendor/forstore/vendor_material_person.html

@@ -1788,7 +1788,7 @@
 							<!--<span ng-if="material.batchCount" ng-show="!isBatch && !material.exPandOper && !material.addGoodsOper" ng-click="expandGoods(material)"><span>展开<i class="fa fa-angle-down" style="margin-left:2px;"></i></span></span>-->
 							<!--收起-->
 							<span ng-show="!isBatch && material.exPandOper" ng-click="disExpandGoods(material)" class="packUp"><span>收起<i class="fa fa-angle-up" style="margin-left:2px;"></i></span></span>
-							<span ng-click="setActiveIndex($index)"><span>编辑可替代型号</span></span>
+							<span ng-click="setActiveIndex($index,material)"><span>编辑可替代型号</span></span>
 							<!--<a ng-show="!isBatch" ng-click="showShelfArea(material)"><span ng-if="!isBatch">编辑</span></a>-->
 							<!--<span ng-show="!isBatch && (material.sold == 0 && material.canSell == 1)" ng-click="publishGoods(material)"><span ng-if="!isBatch">上架</span></span>-->
 						</td>
@@ -2379,8 +2379,8 @@
 <div class="com-modal-wrap" ng-if="activeIndex > -1">
 	<div class="edit-replace-box">
 		<div class="title">
-			<div>型号:<span>asdasdasdad</span></div>
-			<div>品牌:<span>asdasdasdasd</span></div>
+			<div>型号:<span>{{editCmp}}</span></div>
+			<div>品牌:<span>{{editBrand}}</span></div>
 			<i class="fa fa-close" ng-click="setActiveIndex(-1)"></i>
 		</div>
 		<div class="content">
@@ -2389,22 +2389,22 @@
 			</div>
 			<div class="content-line" ng-repeat="mate in replaceMaterialList track by $index">
 				<div class="form-item form-left">
-					<span><i>1</i>型号:</span>
-					<input type="text" class="form-control" ng-model="mate.code" placeholder="请输入型号名称">
+					<span><i>{{mate.detno}}</i>型号:</span>
+					<input type="text" class="form-control" ng-model="mate.ptrCmpcode" placeholder="请输入型号名称">
 					<!--<ul class="similar-list" ng-show="showSimilarCodeList" ng-mouseenter="isInCodeList = true;" ng-mouseleave="isInCodeList = false;">-->
 					<!--<li ng-repeat="sCode in similarCode" ng-bind="sCode.code" title="{{sCode.code}}"></li>-->
 					<!--</ul>-->
 				</div>
 				<div class="form-item form-right">
 					<span>品牌:</span>
-					<input type="text" class="form-control" ng-model="mate.brand" placeholder="请输入品牌名称">
+					<input type="text" class="form-control" ng-model="mate.ptrBranden" placeholder="请输入品牌名称">
 					<i class="fa fa-minus-circle" ng-if="replaceMaterialList.length > 1" ng-click="setReplies('sub', $index)"></i>
 					<i class="fa fa-plus-circle" ng-if="replaceMaterialList.length < 10" ng-click="setReplies('add', $index)"></i>
 				</div>
 			</div>
 		</div>
 		<div class="operate">
-			<span>确定</span>
+			<span ng-click="setProductReplacesByPerson(replaceMaterialList)">确定</span>
 			<span ng-click="setActiveIndex(-1)">取消</span>
 		</div>
 	</div>