替代物料验收反馈修改5

src/main/java/com/uas/platform/b2c/common/account/service/impl/UserServiceImpl.java

@@ -330,6 +330,7 @@ public class UserServiceImpl implements UserService {
 		model.put("userTel", user.getUserTel());
 		model.put("rootpath", AgentUtils.getHost(request));
 		if (user.getUserEmail() != null) {
+			//mailService.send("a4c45a22-436a-430c-9667-4edfd7d04a27", newUserEmail, data);
 			//mailService.send(messageConf.getTplInvitationForB2B(), user.getUserEmail(), model);
 		}
 		return user;

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

@@ -270,22 +270,21 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 		// 确认删除
 		$scope.confirmDelete = function (ids) {
 			if ($scope.isChoosedAll) {
-				if ($scope.standard_tab == 'standard') {
+
 					Material.deleteStandardAll(null, null, function (data) {
 						$scope.deleteDiv = false;
-						loadDataReload();
-						if (data.code != 1) {
-							toaster.pop('error', data.message);
-						} else {
-							toaster.pop('success', data.message);
-						}
-					}, function (response) {
-						toaster.pop('error', '批量删除信息失败');
-					});
-				} else {
-					Material.deleteUnstandardAll(null, null, function (data) {
-						$scope.deleteDiv = false;
-						loadDataReload();
+                        Material.deleteUnstandardAll(null, null, function (data) {
+                            $scope.deleteDiv = false;
+                            loadDataReload();
+                            if (data.code != 1) {
+                                toaster.pop('error', data.message);
+                            } else {
+                                toaster.pop('success', data.message);
+                            }
+                        }, function (response) {
+                            toaster.pop('error', '批量删除信息失败');
+                        });
+
 						if (data.code != 1) {
 							toaster.pop('error', data.message);
 						} else {
@@ -294,7 +293,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 					}, function (response) {
 						toaster.pop('error', '批量删除信息失败');
 					});
-				}
+
 			} else {
 				var ids = $scope.choosedIds.join(',');
 				Material.deleteBatch({ids: ids, isPerson: 1}, function (data) {

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

@@ -1815,7 +1815,7 @@
 				<div class="search fl">
 					<input type="text" class="form-control" ng-model="param.keyword" ng-search="onSearch()" placeholder="类目/型号/品牌"/>
 					<button ng-click="onSearch()">搜索</button>
-					<a ng-click="download()">批量导出</a>
+					<!--<a ng-click="download()">批量导出</a>-->
 				</div>
 				<div class="check fr">
 					<!--<a ng-show="!isBatch && standard_tab == 'unstandard'" ng-click="matchAll()"><span ng-show="!isBatch && standard_tab == 'unstandard'">一键匹配</span></a>-->