Pārlūkot izejas kodu

线下分期跳转至设置账户页面,erp在售产品操作调整

yangc 8 gadi atpakaļ
vecāks
revīzija
9400f9826a

+ 1 - 1
src/main/webapp/resources/js/vendor/app.js

@@ -541,7 +541,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
             controllerUrl : "app/controllers/forstore/vendor_undercarriageCtrl",
             controller : 'vendor_undercarriageCtrl'
         })).state('pay_center', angularAMD.route({
-			url: '/payCenter',
+			url: '/payCenter?tab',
 			templateUrl: 'static/view/vendor/forstore/pay_center.html',
 			controller: 'payCenterCtrl',
 			controllerUrl: 'app/controllers/forstore/pay_center_ctrl'

+ 2 - 2
src/main/webapp/resources/js/vendor/controllers/forstore/pay_center_ctrl.js

@@ -3,7 +3,7 @@
  */
 define(['app/app'], function(app) {
     'use strict';
-    app.register.controller('payCenterCtrl', ['$scope', '$rootScope', 'bankInfoService', 'Loading', 'toaster', '$upload', 'ngTableParams', 'BaseService', 'SessionService', 'bankTransferService', 'Purchase', '$filter', function($scope, $rootScope, bankInfoService, Loading, toaster, $upload, ngTableParams, BaseService, SessionService, bankTransferService, Purchase, $filter) {
+    app.register.controller('payCenterCtrl', ['$scope', '$rootScope', 'bankInfoService', 'Loading', 'toaster', '$upload', 'ngTableParams', 'BaseService', 'SessionService', 'bankTransferService', 'Purchase', '$filter', '$stateParams', function($scope, $rootScope, bankInfoService, Loading, toaster, $upload, ngTableParams, BaseService, SessionService, bankTransferService, Purchase, $filter, $stateParams) {
         $rootScope.active = 'pay_center';
 
         document.title = '结算中心-优软商城';
@@ -16,7 +16,7 @@ define(['app/app'], function(app) {
         $scope.$payCenter = {};
         $scope.param = {};
 
-        $scope.tab = hiStatus == null ? 'paymentRecord' : hiStatus;
+        $scope.tab = $stateParams.tab == 'accountTab' ? $stateParams.tab : hiStatus == null ? 'paymentRecord' : hiStatus;
         $scope.$$bankInfo = {};
 
         $scope.paytype = 'ALL';

+ 3 - 3
src/main/webapp/resources/view/vendor/forstore/erp/vendor_onSale_erp.html

@@ -675,9 +675,9 @@
                             </div>
                         </td>
                         <td class="padding0">
-                            <div ng-if="!commodity.sourceId"><a class="edit" ng-click="editCommodity(commodity)">修改</a></div><!--updateCommodityInfo(commodity, false)-->
-                            <div ng-if="commodity.sourceId"><a style="margin: 0;">来源UAS</a></div>
-                            <div ng-if="!commodity.sourceId"><a ng-click="soldOut(commodity)">下架</a></div>
+                            <div><a class="edit" ng-click="editCommodity(commodity)">修改</a></div><!--updateCommodityInfo(commodity, false)-->
+                            <!--<div ng-if="commodity.sourceId"><a style="margin: 0;">来源UAS</a></div>-->
+                            <div><a ng-click="soldOut(commodity)">下架</a></div>
                         </td>
                     </tr>
                     <tr class="edit-form" ng-if="commodity.edit">

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

@@ -939,7 +939,7 @@
 		</p>
 		<div class="deal-btn">
 			<a ng-click="setShowNoAccountBox(false)">确定</a>
-			<a href="vendor#/payCenter" target="_blank">设置收款账户<i class="fa fa-long-arrow-right"></i></a>
+			<a ui-sref="pay_center({tab:'accountTab'})" target="_blank">设置收款账户<i class="fa fa-long-arrow-right"></i></a>
 		</div>
 	</div>
 </div>