Merge remote-tracking branch 'origin/dev' into bug

src/main/webapp/resources/view/prod/modal/edit-invoice-modal.html

@@ -201,7 +201,7 @@
                             <label for="check-mpy"></label>
                              <span>我已阅读并同意</span>
                      </label>
-                     <a href="help#/nav/19" class="base-line" target="_blank" style=" position: relative;top: -3px;">《发票须知》</a>
+                     <a href="help/helpList/19" class="base-line" target="_blank" style=" position: relative;top: -3px;">《发票须知》</a>
                     </div>
               </div>
               <div class="col-md-offset-3">
@@ -341,7 +341,7 @@
                           <label for="check-mzy"></label>
                           <span>我已阅读并同意</span>
                       </label>
-                      <a href="help#/nav/19">《发票须知》</a>
+                      <a href="help/helpList/19">《发票须知》</a>
                   </div>
               </div>
               <div class="col-md-offset-3">

src/main/webapp/resources/view/vendor/forstore/vendor_delivery.html

@@ -168,8 +168,8 @@
                     </dd>
                     <dd class="oder_l" ng-repeat="detail in checkinvoice.invoiceFPurchaseDetails">
                             <span class="wid01">
-                                <a href="javascript:void(0)"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="42" height="42"/></a>
-                                <p ng-bind="detail.cmpCode"></p>
+                                <a href="store/{{::detail.storeid}}/{{::detail.batchCode}}"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="42" height="42"/></a>
+                                <p><a href="store/{{detail.storeid}}/{{::detail.batchCode}}" ng-bind="detail.cmpCode" title="{{detail.cmpCode}}" class="text-more" style="width: 160px;margin-top: 3px;"></a></p>
                             </span>
                         <span  class="wid01" ng-bind="detail.kiName"></span>
                         <span ng-bind="detail.number | number"></span>