Merge remote-tracking branch 'origin/feature/yc-mysql_erp-1020' into feature/yc-mysql_erp-1020

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

@@ -12,8 +12,8 @@ define(['app/app'], function(app) {
 		//银行账户信息，历史记录的的的状态
 		var hiStatus= SessionService.get('paycenter');
 
-		$scope.status = hiStatus == null ? 'pay-info' : hiStatus;
-
+		// $scope.status = hiStatus == null ? 'pay-info' : hiStatus;
+		$scope.status = 'pay-history';
 		//企业和个人的账户状态
 		var accStatus= SessionService.get('accountstatus');
 		if ($rootScope.userInfo && $rootScope.userInfo.enterprises) {

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

@@ -500,13 +500,13 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
             controller : 'vendor_materialCtrl'
         })).state('vendor_material_erp', angularAMD.route({
 			title : '可上架产品toErp',
-			url : '/vendor_material_erp',
+			url : '/vendor_material_erp?standardParam',
 			templateUrl : 'static/view/vendor/forstore/erp/vendor_material_erp.html',
 			controllerUrl : "app/controllers/forstore/vendor_materialCtrl",
 			controller : 'vendor_materialCtrl'
 		})).state('vendor_material_unstandard_erp', angularAMD.route({
 			title : '暂不可上架产品toErp',
-			url : '/vendor_material_unstandard_erp',
+			url : '/vendor_material_unstandard_erp?standardParam',
 			templateUrl : 'static/view/vendor/forstore/erp/vendor_material_erp.html',
 			controllerUrl : "app/controllers/forstore/vendor_materialCtrl",
 			controller : 'vendor_materialCtrl'

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

@@ -20,7 +20,7 @@ define(['app/app'], function(app) {
         var enIdFilter = $filter('EncryptionFilter');
 
         $scope.$payCenter = {};
-        $scope.$payCenter.tab = "accountTab";
+        $scope.$payCenter.tab = "paymentRecode";
         //控制删除div显示
         $scope.$payCenter.deleteDiv = false;
         //删除id

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

@@ -1,15 +1,29 @@
 define([ 'app/app' ], function(app) {
 	'use strict';
-	app.register.controller('vendor_materialCtrl', ['$scope', '$rootScope', 'Material', 'toaster', 'ComponentActive', 'Enterprise', '$q', 'NumberService', '$location', function ($scope, $rootScope, Material, toaster, ComponentActive, Enterprise, $q, NumberService, $location) {
+	app.register.controller('vendor_materialCtrl', ['$scope', '$rootScope', 'Material', 'toaster', 'ComponentActive', 'Enterprise', '$q', 'NumberService', '$location', '$stateParams', function ($scope, $rootScope, Material, toaster, ComponentActive, Enterprise, $q, NumberService, $location, $stateParams) {
 		$rootScope.active = 'vendor_material';
 
 		$scope.tab = 'material';
-		$scope.standard_tab = 'standard';
+		$scope.standard_tab = $stateParams.standardParam?$stateParams.standardParam:'standard';
 		$scope.choosedIds = [];
 		$scope.deleteDiv = false;
+
+        $scope.param = {
+            page : 1,
+            count : 10,
+            sorting : {
+                id : 'DESC'
+            },
+            isStandard : true,
+            type : "standard"
+        };
+
 		if ($location.$$path.endsWith('vendor_material_unstandard_erp')) {
 			$scope.tab = 'unstandard_material';
-			$scope.standard_tab = 'unstandard';
+			// $scope.standard_tab = 'unstandard';
+            $scope.param.type = "nStandard";
+            // $scope.param.sorting = {code : 'ASC'};
+            $scope.isBatch = false;
 		}
 		/**
 		 * 最大
@@ -25,16 +39,6 @@ define([ 'app/app' ], function(app) {
 		//只包含中文和英文的字符
 		var pattern = /^[\u4e00-\u9fa5a-zA-Z]+$/;
 
-		$scope.param = {
-			page : 1,
-			count : 10,
-			sorting : {
-				id : 'DESC'
-			},
-			isStandard : true,
-			type : "standard"
-		};
-
 		$scope.goods = { breakUp: 1, isSelfSupport: 1, prices: [{}] };
 		$scope.isSelfSupport = true;
 		$scope.showShelfArea = showShelfArea;

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

@@ -178,22 +178,22 @@
 <div class="user_right fr" id="pay_center">
 	<!--支付中心-->
 	<div class="pay_record oder">
-		<div class="user_r_01">
-			<dl>
-				<dt><img src="static/img/user/images/user_photo.png" /></dt>
-				<dd>
-					<span>{{userInfo.userName}}<br/>
-						<!--<em>账户余额：￥<b ng-bind="0"></b></em>-->
-					</span>
-					<a href="user#/accountManager">账户设置&nbsp;》</a>
-				</dd>
-			</dl>
-		</div>
+		<!--<div class="user_r_01">-->
+			<!--<dl>-->
+				<!--<dt><img src="static/img/user/images/user_photo.png" /></dt>-->
+				<!--<dd>-->
+					<!--<span>{{userInfo.userName}}<br/>-->
+						<!--&lt;!&ndash;<em>账户余额：￥<b ng-bind="0"></b></em>&ndash;&gt;-->
+					<!--</span>-->
+					<!--<a href="user#/accountManager">账户设置&nbsp;》</a>-->
+				<!--</dd>-->
+			<!--</dl>-->
+		<!--</div>-->
 		<div class="oder01" style="margin-bottom: 16px;">
 			<ul>
-				<li ng-class="{'active' : status=='pay-info'}" ng-click="toggleStatus('pay-info')"><a href="javascript:void(0)">银行账户信息</a></li>
+				<!--<li ng-class="{'active' : status=='pay-info'}" ng-click="toggleStatus('pay-info')"><a href="javascript:void(0)">银行账户信息</a></li>-->
 				<li ng-class="{'active' : status=='pay-history'}" ng-click="toggleStatus('pay-history')"><a href="javascript:void(0)">支付记录</a></li>
-				<li class="new-account" ng-click="editAccount()" style="color: #5078cb;" ng-if="!userInfo.enterprises"><i class="fa fa-plus-circle"></i>&nbsp;&nbsp;新增账户</li>
+				<!--<li class="new-account" ng-click="editAccount()" style="color: #5078cb;" ng-if="!userInfo.enterprises"><i class="fa fa-plus-circle"></i>&nbsp;&nbsp;新增账户</li>-->
 			</ul>
 		</div>
 		<div class="oder01" ng-if="status=='pay-info' && userInfo.enterprises" style="margin-bottom: 10px;">

src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_erp.html

@@ -432,8 +432,8 @@
 	<div class="pro_management device">
 		<div class="com_tab">
 			<ul class="fl" style="width: 100%">
-				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material_erp">可上架产品</a></li>
-				<li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp">暂不可上架产品</a></li>
+				<li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material_erp({standardParam:'standard'})">可上架产品</a></li>
+				<li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp({standardParam:'unstandard'})">暂不可上架产品</a></li>
 				<li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale_erp">已上架</a></li>
 				<li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>
 			</ul>

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

@@ -384,15 +384,10 @@
         <!--</div>-->
         <div class="oder01">
             <ul>
-                <li class="active"><a href="javascript:void(0)">收款账户信息</a></li>
-            </ul>
-        </div>
-        <div class="oder01">
-            <ul>
-                <li ng-click="setTab('accountTab')" ng-class="{'active' : $payCenter.tab == 'accountTab'}"><a href="javascript:void(0)">收款账户信息</a></li>
-                <li ng-click="setTab('accountHis')" ng-class="{'active' : $payCenter.tab == 'accountHis'}"><a href="javascript:void(0)">账户申请记录</a></li>
+                <!--<li ng-click="setTab('accountTab')" ng-class="{'active' : $payCenter.tab == 'accountTab'}"><a href="javascript:void(0)">收款账户信息</a></li>-->
+                <!--<li ng-click="setTab('accountHis')" ng-class="{'active' : $payCenter.tab == 'accountHis'}"><a href="javascript:void(0)">账户申请记录</a></li>-->
                 <li ng-click="setTab('paymentRecode')" ng-class="{'active' : $payCenter.tab == 'paymentRecode'}"><a href="javascript:void(0)">收款记录</a></li>
-                <li ng-if="$payCenter.tab == 'accountTab'" class="new-account" ng-click="newAccount()"><a ng-disabled="bankInfos.length > 0" ><i class="fa fa-plus-circle"></i>&nbsp;新增账户</a></li>
+                <!--<li ng-if="$payCenter.tab == 'accountTab'" class="new-account" ng-click="newAccount()"><a ng-disabled="bankInfos.length > 0" ><i class="fa fa-plus-circle"></i>&nbsp;新增账户</a></li>-->
             </ul>
         </div>
         <!--支付中心列表-->