yangc 8 лет назад
Родитель
Сommit
a049754b50

+ 0 - 10
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_invoice_ctrl.js

@@ -93,19 +93,9 @@ define([ 'app/app' ], function(app) {
         }
 
         $scope.searchByKey = function (k) {
-        //    console.log($scope.keyword)
-        //     $scope.param.keyword = k;
-        //     console.log(k)
-        //     console.log($scope.param.keyword)
             $scope.keyword = k;
             initTable();
         }
-        $scope.enterEvent = function (e) {
-            var keycode = window.event?e.keyCode:e.which;
-            if(keycode==13){
-                $scope.searchByKey();
-            }
-        }
 
         $scope.enterEvent = function(e, keyword) {
             var keycode = window.event ? e.keyCode : e.which;

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

@@ -264,7 +264,7 @@
         </div>
         <div class="invoice-search">
             <div class="fr">
-                <input type="text" ng-keydown="enterEvent($event)"  class="form-control" ng-model="keyword" placeholder="订单号/发票抬头/收票人/联系电话"/>
+                <input type="text" ng-keydown="enterEvent($event, keyword)"  class="form-control" ng-model="keyword" placeholder="订单号/发票抬头/收票人/联系电话"/>
                 <button ng-click="searchByKey(keyword)">搜索</button>
             </div>
         </div>
@@ -337,7 +337,7 @@
     <div class="vendor-invoice" ng-if="active == 'apply_record'">
         <div class="invoice-search" style="margin-top: 5px;margin-bottom: 16px; width: 100%">
             <div class="fr">
-                <input type="text" ng-keydown="enterEvent($event)"  class="form-control" ng-model="keyword" placeholder="订单号/发票抬头/收票人/联系电话"/>
+                <input type="text" ng-keydown="enterEvent($event, keyword)"  class="form-control" ng-model="keyword" placeholder="订单号/发票抬头/收票人/联系电话"/>
                 <button ng-click="searchByKey(keyword)">搜索</button>
             </div>
         </div>