订单跳转

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

@@ -73,6 +73,7 @@ define([ 'app/app' ], function(app) {
                             item.checked = false
                             item.billInfo = angular.fromJson(item.billInfo);
                             item.orderids = item.orderids.split(',')
+                            item.purchaseids = item.purchaseids ? item.purchaseids.split(',') : item.orderids
                         })
                         //划分数据
                         $scope.billData = page.content;

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

@@ -255,7 +255,7 @@ body div.ng-table-pager a.page-a {
             </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)" class="form-control" ng-model="keyword" placeholder="卖家/订单号/收票人/联系电话"/>
                     <button ng-click="searchByKeyword()">搜索</button>
                 </div>
             </div>

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

@@ -473,7 +473,10 @@
                                     <div class="pull-left w50">
                                         <div class="pull-left name">订单号: </div>
                                         <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
-                                            <p ng-repeat="orderid in item.orderids"><a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a></p>
+                                            <p ng-repeat="(col,orderid) in item.orderids">
+                                                <a ng-href="vendor#/purchase/detail/{{item.purchaseids[col] | EncryptionFilter}}" ng-bind="orderid" title="{{orderid}}" target="_blank"></a>
+                                                <!--<a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a>-->
+                                            </p>
                                         </div>
                                     </div>
                                 </div>
@@ -634,7 +637,10 @@
                                     <div class="pull-left w50">
                                         <div class="pull-left name">订单号: </div>
                                         <div class="pull-left marginLeft" style="max-width: 224px;max-height: 40px;overflow-y: auto;">
-                                            <p ng-repeat="orderid in item.orderids"><a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a></p>
+                                            <p ng-repeat="(col,orderid) in item.orderids">
+                                                <!--<a target="_blank"  ng-href="user#/order/detail/{{orderid | EncryptionFilter}}">{{orderid}}</a>-->
+                                                <a ng-href="vendor#/purchase/detail/{{item.purchaseids[col] | EncryptionFilter}}" ng-bind="orderid" title="{{orderid}}" target="_blank"></a>
+                                            </p>
                                         </div>
                                     </div>