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

src/main/webapp/resources/view/usercenter/b2b/fa/arCheck.html

@@ -1081,7 +1081,7 @@
                   <!--<input ng-model="childs.$selected" name="checkbox" type="checkbox" ng-checked="childs.$selected" ng-click="stopPrevent($event)" ng-if="childs.haveChecked !== 1">-->
                   <!--<span ng-if="childs.haveChecked === 1">已对账</span>-->
                   <!--</td>-->
-                  <td width="70" rowspan="{{index}}" ng-if="index === 0"></td>
+                  <td width="70" rowspan="{{check.details.length}}" ng-if="index === 0"></td>
                   <td width="70">{{::childs.inoutno}}</td>
                   <td width="70">{{::childs.sendcode}}</td>
                   <td width="70">{{::childs.prodcode}}</td>
@@ -1292,6 +1292,7 @@
     padding:2px;
     vertical-align: middle;
     border:1px solid #fff;
+    height:38px;
   }
   #order-detail-list .child-table tr th:first-child{
     text-align: center;

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

@@ -1167,7 +1167,7 @@
                                   <input ng-model="childs.$selected" name="checkbox" type="checkbox" ng-checked="childs.$selected" ng-click="stopPrevent($event)" ng-if="childs.haveChecked !== 1">
                                   <span ng-if="childs.haveChecked === 1">已对账</span>
                               </td>
-                              <td width="70" rowspan="{{index}}" ng-if="index === 0"></td>
+                              <td width="70" rowspan="{{check.details.length}}" ng-if="index === 0"></td>
                               <td width="70">{{::childs.inoutno}}</td>
                               <td width="70">{{::childs.sendcode}}</td>
                               <td width="70">{{::childs.prodcode}}</td>
@@ -1422,6 +1422,7 @@
         padding:2px;
         vertical-align: middle;
         border:1px solid #fff;
+        height:38px;
     }
     #order-detail-list .child-table tr th:first-child{
         text-align: center;