Merge remote-tracking branch 'origin/release-201843-wangcz' into release-201843-wangcz

src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -823,10 +823,10 @@
           <tr>
             <th width="36" style="vertical-align: middle;">
               <input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>
-            <!--<th width="100">本次<br>对账数</th>-->
-            <th width="70">客户<br>名称</th>
+            <th width="100">本次<br>对账数</th>
+            <!--<th width="70">客户<br>名称</th>-->
             <th width="60">单据<br>编号</th>
-            <th width = "60">发货<br>单号</th>
+            <th width="60">发货<br>单号</th>
             <th width="35">序号</th>
             <th width="60">类型</th>
             <th width="60">单据<br>日期</th>

src/main/webapp/resources/view/vendor/b2b/apCheck_detail.html

@@ -312,9 +312,9 @@
     </div>
     <div class="row" style="margin: 0 auto 30px;">
       <div ng-hide="data.status || !data.code" class="col-xs-1 col-xs-offset-5"><button class="btn btn-success" ng-click="submitApCheck()">提交</button></div>
-      <div ng-hide="data.status || !data.code"  class="col-xs-1"><button class="btn btn-info" ui-sref="fa.apCheck" ng-click="deleteApCheck()">删除</button></div>
-      <div ng-if="data.checkStatus == '不同意'" class="col-xs-1 col-xs-offset-5"><button class="btn btn-warning" ui-sref="fa.apCheck" ng-click="cancelApCheck(data)">作废</button></div>
-      <div ng-show="data.status == 314 && data.checkStatus != '已作废'" class="col-xs-1 col-xs-offset-5"><button class="btn btn-warning" ui-sref="fa.apCheck" ng-click="cancelApCheck(data)">作废</button></div>
+      <div ng-hide="data.status || !data.code"  class="col-xs-1"><button class="btn btn-info" ui-sref="fa_apCheck" ng-click="deleteApCheck()">删除</button></div>
+      <div ng-if="data.checkStatus == '不同意'" class="col-xs-1 col-xs-offset-5"><button class="btn btn-warning" ui-sref="fa_apCheck" ng-click="cancelApCheck(data)">作废</button></div>
+      <div ng-show="data.status == 314 && data.checkStatus != '已作废'" class="col-xs-1 col-xs-offset-5"><button class="btn btn-warning" ui-sref="fa_apCheck" ng-click="cancelApCheck(data)">作废</button></div>
       <div class="col-xs-7 col-xs-offset-2" ng-show="data.status == 314" style="margin-top:5px">
         <span class="text-muted">对账单的来源表，已被客户ERP反过账（删除失效），因此本对账单只能作废</span>
       </div>