fix html~~~

src/main/ui/index.html

@@ -888,11 +888,6 @@ margin-bottom: 10%;"/>
                                             <!--<i class="fa fa-users" aria-hidden="true"></i> -->Cashiers Management
                                         </a>
                                     </li>
-                                    <li ng-if="currentUser.client.client_moniker=='PINE'">
-                                        <a ui-sref="bill_qrcode">
-                                            Bill QR Code
-                                        </a>
-                                    </li>
                                 </ul>
                             </li>
                             <li ng-if="([1,2]|withRole)">
@@ -919,16 +914,21 @@ margin-bottom: 10%;"/>
                     </li>
 
                     <li class="has-submenu" ng-class="{'open' : products.active}" ui-sref-active="active">
-                        <a ng-click="products.active = !products.active"><i class="fa fa-balance-scale"></i>Products & Sale</a>
+                        <a ng-click="products.active = !products.active"><i class="fa fa-balance-scale"></i>Extended products</a>
                         <ul class="submenu" ng-class="{'open' : products.active}">
                             <li>
                                 <a ui-sref="goods">
-                                    <!--<i class="fa fa-shopping-bag"></i> -->Products
+                                    <!--<i class="fa fa-shopping-bag"></i> -->Products & Sale
                                 </a>
                             </li>
-                            <li>
+                           <!-- <li>
                                 <a ui-sref="sale">
-                                    <!--<i class="fa fa-shopping-cart"></i>-->Sale
+                                    &lt;!&ndash;<i class="fa fa-shopping-cart"></i>&ndash;&gt;Sale
+                                </a>
+                            </li>-->
+                            <li ng-if="currentUser.client.client_moniker=='PINE' || currentUser.client.client_moniker=='OCCO'">
+                                <a ui-sref="bill_qrcode">
+                                    Bill QR Code
                                 </a>
                             </li>
                         </ul>

src/main/ui/static/boot/index-boot.js

@@ -59,7 +59,6 @@ var modules = [
     {path: 'static/boot/indexMainApp', module: 'indexMainApp', roles: [1, 2, 3]},
     {path: 'static/commons/commons', module: 'commons', roles: [1, 2, 3]},
     {path: 'static/payment/good/good-manage', module: 'goodManagement', roles: [1, 2, 3]},
-    {path: 'static/payment/good/good-sale', module: 'goodSale', roles: [1, 2, 3]},
     {path: 'static/payment/partner/partner', module: 'partnerInfoApp', roles: [1, 2, 3]},
     {path: 'static/payment/tradelog/tradelog', module: 'tradeLogApp', roles: [1, 2, 3]},
     {path: 'static/payment/tradelog/transflow', module: 'balanceReport', roles: [1, 2, 3]},

src/main/ui/static/payment/good/good-manage.js

@@ -10,6 +10,11 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
             templateUrl: '/static/payment/good/templates/goods.html',
             controller: 'goodListCtrl',
             data: {label: '商品列表'}
+        }).state('goods.sale', {
+            url: '/sale',
+            templateUrl: '/static/payment/good/templates/good_sale.html',
+            controller: 'goodOrderListCtrl',
+            data: {label: '商品列表'}
         }).state('goods.new', {
             url: '/new',
             templateUrl: '/static/payment/good/templates/add_good.html',
@@ -196,7 +201,57 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
         $scope.ctrl = {};
 
     }]);
-
+    app.controller('goodOrderListCtrl', ['$scope', '$http', function ($scope, $http) {
+        $scope.pagination = {};
+        $scope.params = {status:'1'};
+        $scope.today = new Date();
+        $scope.chooseToday = function () {
+            $scope.params.datefrom = $scope.params.dateto = new Date();
+            $scope.loadGoodOrders(1);
+        };
+        $scope.chooseYesterday = function () {
+            var yesterday = new Date();
+            yesterday.setDate(yesterday.getDate() - 1);
+            $scope.params.datefrom = $scope.params.dateto = yesterday;
+            $scope.loadGoodOrders(1);
+        };
+        $scope.chooseLast7Days = function () {
+            $scope.params.dateto = new Date();
+            var day = new Date();
+            day.setDate(day.getDate() - 7);
+            $scope.params.datefrom = day;
+            $scope.loadGoodOrders(1);
+        };
+        $scope.thisMonth = function () {
+            $scope.params.dateto = new Date();
+            var monthBegin = new Date();
+            monthBegin.setDate(1);
+            $scope.params.datefrom = monthBegin;
+            $scope.loadGoodOrders(1);
+        };
+        $scope.lastMonth = function () {
+            var monthFinish = new Date();
+            monthFinish.setDate(0);
+            $scope.params.dateto = monthFinish;
+            var monthBegin = new Date();
+            monthBegin.setDate(0);
+            monthBegin.setDate(1);
+            $scope.params.datefrom = monthBegin;
+            $scope.loadGoodOrders(1);
+        };
+        $scope.loadGoodOrders = function (page) {
+            var params = angular.copy($scope.params);
+            if (params.status=='ALL'){
+                delete params.status;
+            }
+            params.page = page || $scope.pagination.page || 1;
+            $http.get('/sys/client/goods/goodOrders', {params: params}).then(function (resp) {
+                $scope.sales = resp.data.data;
+                $scope.pagination = resp.data.pagination;
+            });
+        };
+        $scope.loadGoodOrders(1);
+    }]);
 
     return app;
 });

src/main/ui/static/payment/good/good-sale.js

@@ -1,6 +1,7 @@
 /**
  * Created by yishuqian on 8/29/16.
  */
+/*
 define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootSwitch'], function (angular) {
     'use strict';
 
@@ -67,4 +68,4 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
     }]);
 
     return app;
-});
+});*/

src/main/ui/static/payment/good/templates/good_sale.html

@@ -1,15 +1,3 @@
-<div ui-view>
-    <section class="content-header">
-        <h1>List of Products Sold</h1>
-        <ol class="breadcrumb">
-            <li>
-                <i class="fa fa-sitemap"></i> Products & Sale
-            </li>
-            <li class="active">Sale</li>
-        </ol>
-    </section>
-
-    <div class="content">
 <div class="row">
     <div class="col-sm-12">
         <div class="box-solid">
@@ -144,7 +132,9 @@
                                     first-text="&laquo;"
                                     last-text="&raquo;"></uib-pagination>
                     <div class="row">
-                                <div class="col-xs-12">Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}</div>
+                        <div class="col-xs-12">Total Records:{{pagination.totalCount}};Total
+                            Pages:{{pagination.totalPages}}
+                        </div>
                     </div>
                 </div>
             </div>
@@ -154,5 +144,3 @@
 
     </div>
 </div>
-    </div>
-</div>

src/main/ui/static/payment/good/templates/goods.html

@@ -1,15 +1,26 @@
-<div ui-view>
+
 <section class="content-header">
-        <h1>Product Management</h1>
+    <h1>Product & Sale</h1>
     <ol class="breadcrumb">
         <li>
             <i class="fa fa-sitemap"></i> Products & Sale
         </li>
-            <li class="active">Product Management</li>
+        <li class="active">Product & Sale Management</li>
     </ol>
 </section>
-
 <div class="content">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="nav-tabs-custom">
+                    <ul class="nav nav-tabs">
+                        <li ui-sref-active-eq="active">
+                            <a ui-sref="goods">Product</a>
+                        </li>
+                        <li ui-sref-active="active">
+                            <a ui-sref="goods.sale">Sale</a>
+                        </li>
+                    </ul>
+                    <div class="tab-content" ui-view>
                         <div class="row">
                             <div class="col-sm-12">
                                 <div class="box-solid">
@@ -133,3 +144,7 @@
                         </div>
                     </div>
                 </div>
+            </div>
+        </div>
+
+    </div>