修改买家中心产品导入

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -69,8 +69,8 @@ define([ 'app/app' ], function(app) {
 	}]);
 
 	// 身份认证
-	app.controller('AuthenticationCtrl', ['$scope', '$window', 'AuthenticationService', '$rootScope', 'SessionService', 'collectionService', '$modal', 'toaster','$q', 'Cart', '$http', 'InternalMessage',
-		function($scope, $window, AuthenticationService, $rootScope, SessionService, collectionService, $modal, toaster, $q, Cart, $http, InternalMessage) {
+	app.controller('AuthenticationCtrl', ['$scope', '$window', 'AuthenticationService', '$rootScope', 'SessionService', 'collectionService', '$modal', 'toaster','$q', 'Cart',
+		function($scope, $window, AuthenticationService, $rootScope, SessionService, collectionService, $modal, toaster, $q, Cart ) {
 			$scope.user = {
 				j_username : "",
 				j_password : "",

src/main/webapp/resources/js/usercenter/controllers/forstore/product_upload_ctrl.js

@@ -1,13 +1,13 @@
 define([ 'app/app' ], function(app) {
 	'use strict';
-	app.register.controller('vendorUploadCtrl', ['$scope', '$rootScope', 'ngTableParams', '$upload', '$q', 'AuthenticationService', 'BaseService', 'StoreInfo', 'SessionService', '$modal', 'toaster', 'ReleaseProductByBatch', 'Loading', 'Enterprise', 'DistributionRule', '$state', '$location', function ($scope, $rootScope, ngTableParams, $upload, $q, AuthenticationService, BaseService, StoreInfo, SessionService, $modal, toaster, ReleaseProductByBatch, Loading, Enterprise, DistributionRule, $state, $location) {
+	app.register.controller('productUploadCtrl', ['$scope', '$rootScope', 'ngTableParams', '$upload', '$q', 'AuthenticationService', 'BaseService', 'StoreInfo', 'SessionService', '$modal', 'toaster', 'ReleaseProductByBatch', 'Loading', 'Enterprise', 'DistributionRule', '$state', '$location', function ($scope, $rootScope, ngTableParams, $upload, $q, AuthenticationService, BaseService, StoreInfo, SessionService, $modal, toaster, ReleaseProductByBatch, Loading, Enterprise, DistributionRule, $state, $location) {
         $scope.ignoreImport = 1;
 	    if (!$rootScope.$$productOn) {
             $rootScope.$$productOn = {};
             $rootScope.$$productOn.leadIn = 'bathOn';
             $rootScope.$$productOn.tab = 'bathOnPerson';
         }
-		$rootScope.active = 'vendor_upload';
+		$rootScope.active = 'product_upload';
 		document.title = '产品导入-优软商城';
         //切换展示的信息
         $scope.toggleActive = function(active) {

src/main/webapp/resources/js/vendor/app.js

@@ -508,7 +508,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 		})).state('vendor_upload', angularAMD.route({
 			title : '标准上架',
 			url : '/vendor_upload',
-			templateUrl : 'static/view/vendor/forstore/product_upload.html',
+			templateUrl : 'static/view/vendor/forstore/vendor_upload.html',
 			controllerUrl : "app/controllers/forstore/vendor_upload_ctrl",
 			controller : 'vendorUploadCtrl'
 		})).state('vendor_repository', angularAMD.route({

src/main/webapp/resources/view/usercenter/forstore/product_upload.html

@@ -535,17 +535,17 @@
                 <!--<li ng-class="{'active': $$productOn.tab == 'bathOn'}" ng-click="toggleActive('bathOn')"><a href="">导入产品并上架</a></li>-->
                 <!--<li ng-class="{'active': $$productOn.tab == 'bathOnPerson'}" ng-click="toggleActive('bathOnPerson')"><a href="">导入产品</a></li>-->
             </ul>
-            <ul class="fl" style="width: 100%" ng-if="isPcbStore">
+            <!--<ul class="fl" style="width: 100%" ng-if="isPcbStore">-->
                 <!--<li><a ui-sref="vendor_material">公司产品库</a></li>-->
                 <!--<li><a ui-sref="vendor_material_person">个人产品库</a></li>-->
                 <!--<li><a ui-sref="vendor_onSale">在售产品</a></li>-->
                 <!--<li><a ui-sref="vendor_storage">出入库</a></li>-->
                 <!--<li><a ui-sref="vendor_undercarriage">上下架历史</a></li>-->
-                <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">产品库</a></li>
-                <li ng-class="{'active': tab == 'storage'}"><a ui-sref="vendor_storage">出入库</a></li>
-                <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架记录</a></li>
-                <li class="active"><a ui-sref="vendor_upload">产品导入</a></li>
-            </ul>
+                <!--<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material">产品库</a></li>-->
+                <!--<li ng-class="{'active': tab == 'storage'}"><a ui-sref="vendor_storage">出入库</a></li>-->
+                <!--<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架记录</a></li>-->
+                <!--<li class="active"><a ui-sref="vendor_upload">产品导入</a></li>-->
+            <!--</ul>-->
         </div>
         <div class="remind-line" ng-show="$$productOn.tab == 'bathOn' && showTip"><span class="fl">导入企业库的产品同时会进行上架销售并展示在店铺</span><a ng-click="closeTip()" class="fr">&times;</a></div>
         <!--<div class="remind-line" ng-show="$$productOn.tab == 'bathOnPerson' && showTip">-->

src/main/webapp/resources/view/usercenter/left_nav.html

@@ -41,7 +41,7 @@
                     <li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">采购订单</a></li>
                     <li ng-class="{'active' : active == 'buyer_pay_center'}"><a  ui-sref="pay_center">应付对账</a></li>
                     <li ng-class="{'active' : active == 'buyer_invoice'}"><a  ui-sref="buyer_no_invoice">发票管理</a></li>
-                    <li ng-class="{'active' : active == 'vendor_upload'}" ng-if="personage && !isPcbStore"><a  ui-sref="vendor_upload">产品导入</a></li>
+                    <li ng-class="{'active' : active == 'product_upload'}" ng-if="personage && !isPcbStore"><a  ui-sref="product_upload">产品导入</a></li>
                 </div>
                 <!--<div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion &&  userInfo.emailValidCode && userInfo.emailValidCode == 2)">-->
                     <!--<li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">订单中心</a></li>-->