Merge branch 'dev-mysql' into feature/yc-erp_unstandard-0102

src/main/webapp/WEB-INF/views/normal/erp/user_center.html

@@ -42,6 +42,8 @@
 			</div>
 		</div>
 	</section>
+	<div ng-controller="AuthenticationCtrl">
+	</div>
 	<footer class="clearfix">
 		<div ng-include src="'static/view/common/footer_erp.html'" style="margin-top: 40px;"></div>
 	</footer>

src/main/webapp/WEB-INF/views/normal/erp/vendor_center.html

@@ -39,6 +39,8 @@
 			</div>
 		</div>
 	</section>
+	<div ng-controller="AuthenticationCtrl">
+	</div>
 	<footer class="clearfix" style="margin-top: 40px;">
 		<div ng-include src="'static/view/common/footer_erp.html'"></div>
 	</footer>

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

@@ -1336,7 +1336,6 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 		 * @param goods
 		 */
 		function addGoods(currenctMaterial) {
-			console.log(event);
 			if (!$scope.checkGoodsInfo($scope.goods)) {
 				return ;
 			}
@@ -1727,9 +1726,9 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 			material.addGoodsOper = true;
 			material.exPandOper = true;
 			$scope.expandGoods(material, material.addGoodsOper);
-			if ('ERP' == material.sourceApp) {// 如果是erp上传物料获取物料交易信息
-				getProductDetail(material);
-			} else {
+			// if ('ERP' == material.sourceApp) {// 如果是erp上传物料获取物料交易信息
+			// 	getProductDetail(material);
+			// } else {
 				$scope.goods = { editBreakUp: false, editSelfSale: 2};
 				if($scope.store.enType === 'HK') {
 					$scope.goods.currencyName = 'USD';
@@ -1743,7 +1742,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 				$scope.goods.editPrices.push({start : $scope.minReserve, end : $scope.maxReserve});
 				// $scope.goods.isSelfSupport = $scope.store.status == 'OPENED' ? 1 : 0;
 				material.selected = true;
-			}
+			// }
 		}
 
 		/**