|
|
@@ -804,13 +804,16 @@
|
|
|
<span>合计:</span>
|
|
|
验收数量:<span>{{check.checkQty >= 0 ? (check.checkQty | number:2) :'暂无数据'}}</span>
|
|
|
发货数量:<span>{{check.sendQty >= 0 ? (check.sendQty | number:2) : '暂无数据'}}</span>
|
|
|
- 应收金额:<span ng-if="check.checkAmountList.length > 0" ng-repeat="count in check.checkAmountList">
|
|
|
- <em>{{count.currency}}: {{count.amount}}</em>
|
|
|
- </span>
|
|
|
- <span ng-if="check.checkAmountList.length == 0">
|
|
|
- 暂无数据
|
|
|
- </span>
|
|
|
- 发货金额:<span>{{check.sendAmountList >= 0 ? (check.sendAmountList | number: 2) : '暂无数据'}}</span>
|
|
|
+ 应收金额:
|
|
|
+ <div style="display: inline-block;width: 130px;vertical-align: top;">
|
|
|
+ <p style="margin:0;" ng-repeat="type in check.checkAmountList" ng-if="check.checkAmountList.length > 0"><span>{{type.currency}}:{{type.amount | number: 2}}</span></p>
|
|
|
+ <p style="margin:0;" ng-if="!check.checkAmountList || check.checkAmountList.length === 0"><span>0</span></p>
|
|
|
+ </div>
|
|
|
+ 发货金额:
|
|
|
+ <div style="display: inline-block;width: 130px;vertical-align: top;">
|
|
|
+ <p style="margin:0;" ng-repeat="type in check.sendAmountList" ng-if="check.sendAmountList.length > 0"><span>{{type.currency}}:{{type.amount | number: 2}}</span></p>
|
|
|
+ <p style="margin:0;" ng-if="!check.sendAmountList || check.sendAmountList.length === 0"><span>暂无数据</span></p>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<a ng-show="check.showDetail" class="order-count-click" ng-click="check.showDetail = !check.showDetail">收起 <i class="fa fa-angle-up"></i></a>
|
|
|
<a ng-show="!check.showDetail" class="order-count-click" ng-click="check.showDetail = !check.showDetail">展开 <i class="fa fa-angle-down"></i></a>
|
|
|
@@ -885,7 +888,7 @@
|
|
|
background: #d3eafc;
|
|
|
font-weight: bold;
|
|
|
font-size:14px;
|
|
|
- padding:0 2px;
|
|
|
+ padding:2px;
|
|
|
vertical-align: middle;
|
|
|
border:1px solid #fff;
|
|
|
}
|
|
|
@@ -896,6 +899,9 @@
|
|
|
background: #d3eafc;
|
|
|
font-weight:normal;
|
|
|
}
|
|
|
+ #order-detail-list .child-table tr th .order-count span:first-child{
|
|
|
+ margin:0;
|
|
|
+ }
|
|
|
#order-detail-list .child-table tr th .order-count span{
|
|
|
background: #d3eafc;
|
|
|
font-weight:bold;
|