Home Explore Help
Register Sign In
usoft
/
platform-b2b
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

购物车功能优化

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@10190 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 8 years ago
parent
0bb2a297c6
commit
9ec65d167d
3 changed files with 6 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      src/main/java/com/uas/platform/b2b/service/impl/PurcOrderServiceImpl.java
  2. 2 1
      src/main/webapp/resources/js/index/app.js
  3. 3 0
      src/main/webapp/resources/tpl/index/purc/cart_detail.html

+ 1 - 1
src/main/java/com/uas/platform/b2b/service/impl/PurcOrderServiceImpl.java
View File 

@@ -188,7 +188,7 @@ public class PurcOrderServiceImpl implements PurcOrderService {
 
 						modelMap.put("success", total - alters.size());

 						modelMap.put("success", total - alters.size());

 						// 如果物料不存在，则进行存储

 						// 如果物料不存在，则进行存储

 						List<Product> prods = productDao

 						List<Product> prods = productDao

-								.findByEnUUAndTitle(SystemSession.getUser().getEnterprise().getUu(), product.getTitle());

+								.findByEnUUAndTitle(SystemSession.getUser().getEnterprise().getUu(), product.getCode());

 						if (CollectionUtils.isEmpty(prods)) {

 						if (CollectionUtils.isEmpty(prods)) {

 							product = productDao.save(product);

 							product = productDao.save(product);

 						} else {

 						} else {

+ 2 - 1
src/main/webapp/resources/js/index/app.js
View File 

@@ -12961,6 +12961,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
 	 */

 	 */

 	app.controller('CartDetailController', ['$scope', 'cartOperation', '$stateParams', 'toaster', '$timeout', 'BaseService', 'ngTableParams', '$filter', 'Product', 'Vendor', 'ShipAddress', '$modal', 'newPurcOrder', 'addtoCart', '$http', function($scope, cartOperation, $stateParams, toaster, $timeout, BaseService, ngTableParams, $filter, Product, Vendor, ShipAddress, $modal, newPurcOrder, addtoCart, $http) {

 	app.controller('CartDetailController', ['$scope', 'cartOperation', '$stateParams', 'toaster', '$timeout', 'BaseService', 'ngTableParams', '$filter', 'Product', 'Vendor', 'ShipAddress', '$modal', 'newPurcOrder', 'addtoCart', '$http', function($scope, cartOperation, $stateParams, toaster, $timeout, BaseService, ngTableParams, $filter, Product, Vendor, ShipAddress, $modal, newPurcOrder, addtoCart, $http) {

 		BaseService.scrollBackToTop();

 		BaseService.scrollBackToTop();

+		$scope.loading = true;

 		var loadData = function() {

 		var loadData = function() {

 			cartOperation.getCartDetail({id: $stateParams.id}, function(data) {

 			cartOperation.getCartDetail({id: $stateParams.id}, function(data) {

 				if(data.code) {

 				if(data.code) {

@@ -13201,7 +13202,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
 			});

 			});

 			modalInstance.result.then(function(data) {

 			modalInstance.result.then(function(data) {

 				$scope.contact = data;

 				$scope.contact = data;

-				$scope.contact.venduu = uu;

+				$scope.contact.venduu = $scope.order.receiveCode;

 				Vendor.saveContact({}, $scope.contact, function(data) {

 				Vendor.saveContact({}, $scope.contact, function(data) {

 					Vendor.contacts({venduu: $scope.order.receiveCode}, {}, function(data) {

 					Vendor.contacts({venduu: $scope.order.receiveCode}, {}, function(data) {

 						$scope.contacts = data;

 						$scope.contacts = data;

+ 3 - 0
src/main/webapp/resources/tpl/index/purc/cart_detail.html
View File 

@@ -60,6 +60,9 @@
 
 }

 }

 </style>

 </style>

 <body>

 <body>

+	<div class="loading in" ng-class="{'in': loading}">

+		<i></i>

+	</div>

 	<div class="wrap" id="pub">

 	<div class="wrap" id="pub">

 		<div class="content">

 		<div class="content">

 			<!--<div class="com_title">服务>采购模块>采购单<font>>新增采购单</font></div>-->

 			<!--<div class="com_title">服务>采购模块>采购单<font>>新增采购单</font></div>-->