yangc 7 лет назад
Родитель
Сommit
688c3e63f4

+ 1 - 0
src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -1846,6 +1846,7 @@ define([ 'app/app' ], function(app) {
 				$scope.openHomeCenterModel();
 			}*/
 		// };
+		$rootScope.isPcbStore = true;
 	}]);
 
     function checkNullStr (str) {

+ 20 - 12
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_upload_ctrl.js

@@ -71,14 +71,19 @@ define([ 'app/app' ], function(app) {
 
 		//选择相应的销售类型
 		$scope.sellType = function(type) {
-			if($scope.batch.selfSellEabled) {
-				$scope.batch.sellType = type;
-				if (type == 'UAS') {
-					$scope.setShowSelfSellRemindBox(true);
-				}
-			}else {
-				$scope.batch.sellType = 'UAS';
-			}
+            if (type == 'self') {
+                $scope.batch.selfSellEabled && ($scope.batch.sellType = type);
+            } else if (type == 'UAS') {
+                !$rootScope.isPcbStore && ($scope.batch.sellType = type && $scope.setShowSelfSellRemindBox(true));
+            }
+			// if($scope.batch.selfSellEabled) {
+			// 	$scope.batch.sellType = type;
+			// 	if (type == 'UAS') {
+			// 		$scope.setShowSelfSellRemindBox(true);
+			// 	}
+			// }else {
+			// 	$scope.batch.sellType = 'UAS';
+			// }
 
         };
 
@@ -242,8 +247,9 @@ define([ 'app/app' ], function(app) {
 			} else {
                 var param = {selfSale : $scope.batch.sellType == 'self', currency : $scope.batch.currency, repeatImport : $scope.repeatImport};
 			}
+			var uploadUrl = $rootScope.isPcbStore ? '/release/product/batchRelease/pcb' : 'release/product/release/excel';
 			$upload.upload({
-				url: 'release/product/release/excel',
+				url: uploadUrl,
 				file: file,
 				method: 'POST',
 				params : param
@@ -298,6 +304,7 @@ define([ 'app/app' ], function(app) {
         // 下载模板
         $scope.download = function() {
             var show = SessionService.get($scope.userInfo.userUU + "-releasetip");
+            var downloadUrl = $rootScope.isPcbStore ? '/release/product/release/template/pcb' : '/release/product/release/template'
             if (!show) {
                 var modalInstance = $modal.open({
                     animation: true,
@@ -306,10 +313,10 @@ define([ 'app/app' ], function(app) {
                 });
                 modalInstance.result.then(function(response) {
                 }, function(res) {
-                    window.location.href = $rootScope.rootPath + '/release/product/release/template?currency' + '=' + $scope.batch.currency + ($rootScope.$$productOn.tab == 'bathOnPerson' ? '&isPerson=1' : '');
+                    window.location.href = $rootScope.rootPath + downloadUrl + '?currency=' + $scope.batch.currency + ($rootScope.$$productOn.tab == 'bathOnPerson' ? '&isPerson=1' : '');
                 });
             } else {
-                window.location.href = $rootScope.rootPath + '/release/product/release/template?currency' + '=' + $scope.batch.currency + ($rootScope.$$productOn.tab == 'bathOnPerson' ? '&isPerson=1' : '');
+                window.location.href = $rootScope.rootPath + downloadUrl + '?currency=' + $scope.batch.currency + ($rootScope.$$productOn.tab == 'bathOnPerson' ? '&isPerson=1' : '');
             }
         };
 
@@ -395,6 +402,7 @@ define([ 'app/app' ], function(app) {
             } else {
                 var datatem = {isAjax : true, batch : $scope.result.batch};
             }
+            var downloadFailureUrl = $rootScope.isPcbStore ? '/release/product/release/failure/pcb/xls' : 'release/product/release/failure/xls';
             if($scope.result && $scope.result.batch && $scope.result.filter) {
                 var form = document.getElementById('load-error');
                 form.action= 'release/product/release/failure/xls';
@@ -404,7 +412,7 @@ define([ 'app/app' ], function(app) {
                 var getDownLoadStatus = function () {
                     $.ajax({
                         type: 'GET',
-                        url: 'release/product/release/failure/xls',
+                        url: downloadFailureUrl,
                         data : datatem,
                         dataType : 'json',
                         success: function (data) {

+ 2 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1948,9 +1948,10 @@
 				<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
 				<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
 				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
+				<li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>
 			</ul>
 		</div>
-		<div class="com_tab com_tab2" style="margin-bottom: 0px">
+		<div class="com_tab com_tab2" ng-if="!isPcbStore" style="margin-bottom: 0px">
 			<ul class="fl distance" style="width: 100%">
 				<li ng-class="{active : standard_tab == 'unstandard'}"  ng-click="toggleStandard('unstandard')" title="非标产品({{nCount}})"><a href="" class="standard">非标产品(<em class="count">{{nCount}}</em>)</a></li>
 				<li ng-class="{active : standard_tab =='standard'}" ng-click="toggleStandard('standard')" title="标准产品({{sCount}})"><a href="" class="standard">标准产品(<em class="count">{{sCount}}</em>)</a></li>

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

@@ -1814,6 +1814,7 @@
 				<li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
 				<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
 				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
+				<li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>
 			</ul>
 		</div>
 		<!--<div class="com_tab">

+ 1 - 0
src/main/webapp/resources/view/vendor/forstore/vendor_onSale.html

@@ -961,6 +961,7 @@
                 <li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
                 <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
+                <li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>
                 <li class="down-goods">
                     <!--<span ng-click="downGoods()">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel

+ 1 - 0
src/main/webapp/resources/view/vendor/forstore/vendor_undercarriage.html

@@ -580,6 +580,7 @@
                 <li ng-class="{'active': tab == 'material_person'}"><a ui-sref="vendor_material_person">个人产品库</a></li>
                 <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale">在售产品</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage">上下架历史</a></li>
+                <li ng-if="isPcbStore"><a ui-sref="vendor_upload">产品导入</a></li>
             </ul>
         </div>
         <div class="search-check">

+ 9 - 2
src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -528,10 +528,17 @@
     <!--货品管理-->
     <div class="pro_management device">
         <div class="com_tab">
-            <ul class="fl" style="width: 100%">
+            <ul class="fl" style="width: 100%" ng-if="!isPcbStore">
                 <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">
+                <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_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"><span class="fl">创建您的个人产品库,可为您精准推送客户需求</span><a href="help/helpDetail/56" target="_blank" class="operate-introduce">操作说明</a><a ng-click="closeTip()" class="fr">&times;</a></div>
@@ -565,7 +572,7 @@
                                 <label for="sellbyself" ng-disabled="!batch.selfSellEabled"></label>
                                 <span ng-disabled="!batch.selfSellEabled">店铺自营</span>
                             </label>-->
-                            <span>
+                            <span ng-disabled="isPcbStore">
                                 <img ng-show="batch.sellType == 'self'" src="static/img/upload/daishou-default.png" alt="" ng-click="sellType('UAS')">
                                 <img ng-hide="batch.sellType == 'self'" src="static/img/upload/daishou-active.png" alt="">
                             </span>

+ 4 - 4
src/main/webapp/resources/view/vendor/left_nav.html

@@ -46,8 +46,8 @@
 		<div>
 		<li ng-class="{'active' : active == 'vendor_order'}"><span  ui-sref="vendor_order">订单中心</span></li>
 			<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_productOn">产品导入</span></li>-->
-			<li ng-class="{'active' : active == 'vendor_productOn'}"><span  ui-sref="vendor_upload">产品导入</span></li>
-			<li ng-class="{'active' : active == 'vendor_material'}"><span  ui-sref="vendor_material">产品管理</span></li>
+			<li ng-class="{'active' : active == 'vendor_productOn'}" ng-if="!isPcbStore"><span  ui-sref="vendor_upload">产品导入</span></li>
+			<li ng-class="{'active' : active == 'vendor_material'}"><span  ui-sref="vendor_material" ng-bind="isPcbStore ? 'PCB产品管理' : '产品管理'">产品管理</span></li>
 			<li ng-class="{'active' : active == 'vendor_store'}">
 				<!-- 我要开店 !store && applyStatus == 'NONE' -->
 				<span  ui-sref="vendor_store_apply" ng-if="!store && applyStatus == 'NONE'">开店申请</span>
@@ -69,8 +69,8 @@
 		<li ng-class="{'active' : active == 'vendor_invoice'}"><span  ui-sref="vendorInvoice">发票管理</span></li>
 	<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><span  ui-sref="vendor_logistics">物流管理</span></li>-->
 		<li ng-class="{'active' : active == 'pay_center'}"><span  ui-sref="pay_center">结算中心</span></li>
-		<li ng-class="{'active' : active == 'vendor_brand_apply'}"><span  ui-sref="vendor_brand_apply">品牌申请</span></li>
-		<li ng-class="{'active' : active == 'vendor_component_apply'}"><span  ui-sref="vendor_component_apply">器件申请</span></li>
+		<li ng-class="{'active' : active == 'vendor_brand_apply'}" ng-if="!isPcbStore"><span  ui-sref="vendor_brand_apply">品牌申请</span></li>
+		<li ng-class="{'active' : active == 'vendor_component_apply'}" ng-if="!isPcbStore"><span  ui-sref="vendor_component_apply">器件申请</span></li>
 
 		<!--<li ng-class="{'active' : active == 'vendor_repository'}"><span  ui-sref="vendor_repository">仓库管理</span></li>-->
 		<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->