Browse Source

1、修改出库

shenjj 7 years ago
parent
commit
b4eac7b1db

+ 4 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_storageCtrl.js

@@ -7,7 +7,7 @@ define([ 'app/app' ], function(app) {
         $scope.tab = 'storage';
         $scope.isInt = /^[0-9]*[1-9][0-9]*$/;
         document.title = '卖家出入库-优软商城';
-        $scope.storage_tab = $stateParams.storage_tab? $stateParams.storage_tab : 'inBound';
+        $scope.storage_tab = $stateParams.storage_tab ? $stateParams.storage_tab : 'outBound';
         $scope.countData = 10;
         $scope.userInfo = $rootScope.userInfo || {};
 
@@ -247,16 +247,19 @@ define([ 'app/app' ], function(app) {
                     if($scope.handleItem === 0) {
                         param.type = $scope.type;
                     }
+                    // 出库
                     if($scope.storage_tab === 'outBound' && $scope.handleItem === 2) {
                         param.sorting = {"createtime":"DESC"};
                         param.status = '502-406';
                         param.startMils = $scope.startDate;
                         param.endMils = $scope.endDate;
                     } else {
+                        // 入库
                         param.fromDate = $scope.startDate;
                         param.toDate = $scope.endDate;
                     }
                     if ($scope.handleItem !== 1) {
+                        // 不等于其他出库或者入库
                         Goods[getUrl()](param, function(data) {
                             $scope.storageList = data.content
                             params.total(data.totalElements);

+ 7 - 7
src/main/webapp/resources/view/vendor/forstore/vendor_storage.html

@@ -1153,18 +1153,18 @@
                 <!--<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 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 == 'storage'}"><a ui-sref="vendor_storage">出库</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 ng-class="{'active': tab == 'B2b'}"><a ui-sref="sale_badOut">B2B客户出入库</a></li>
             </ul>
         </div>
-        <div class="com_tab com_tab2" style="margin-bottom: 10px">
-            <ul class="fl distance" style="width: 100%">
-                <li ng-class="{active : storage_tab == 'inBound'}"  ng-click="toggleStorage('inBound')" title="入库"><a href="" class="standard">入库</a></li>
-                <li ng-class="{active : storage_tab =='outBound'}" ng-click="toggleStorage('outBound')" title="出库"><a href="" class="standard">出库</a></li>
-            </ul>
-        </div>
+        <!--<div class="com_tab com_tab2" style="margin-bottom: 10px">-->
+            <!--<ul class="fl distance" style="width: 100%">-->
+                <!--<li ng-class="{active : storage_tab == 'inBound'}"  ng-click="toggleStorage('inBound')" title="入库"><a href="" class="standard">入库</a></li>-->
+                <!--<li ng-class="{active : storage_tab =='outBound'}" ng-click="toggleStorage('outBound')" title="出库"><a href="" class="standard">出库</a></li>-->
+            <!--</ul>-->
+        <!--</div>-->
         <div class="search-check">
             <div class="radio-block" ng-if="handleItem !== 1">
                 更多筛选: