|
|
@@ -236,8 +236,8 @@
|
|
|
<tr class="header">
|
|
|
<th>商品</th>
|
|
|
<th width="120">数量</th>
|
|
|
- <th width="80">是否收费</th>
|
|
|
- <th width="100">单价</th>
|
|
|
+ <th width="60">是否收费</th>
|
|
|
+ <th width="140">单价</th>
|
|
|
<th width="120">需求日期</th>
|
|
|
<th width="70">操作</th>
|
|
|
</tr>
|
|
|
@@ -256,28 +256,29 @@
|
|
|
<a href="sale/sample/xls?_state={{active}}&keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
|
|
|
</td>
|
|
|
</tr>
|
|
|
-
|
|
|
+ <tr class="sep-row">
|
|
|
+ <td colspan="5"></td>
|
|
|
+ </tr>
|
|
|
</thead>
|
|
|
<tbody ng-repeat="sample in $data">
|
|
|
<tr class="order-hd">
|
|
|
- <td class="first">
|
|
|
+ <td class="first" colspan="3">
|
|
|
<div class="order-main">
|
|
|
<!--<span> <input type="checkbox" class="selector"
|
|
|
ng-model="sample.$selected">
|
|
|
</span> --><span class="text-num text-bold" title="{{sample.proofing.date | date: 'yyyy年MM月dd日 hh:mm'}}"
|
|
|
ng-bind="sample.proofing.date | date:'yyyy-MM-dd'"></span>
|
|
|
<span>流水号：<a class="text-num" ng-bind="::sample.proofing.code" ui-sref="sale.sample_detail({id:sample.id})" target="_self"></a></span>
|
|
|
+ <span title="客户名称"
|
|
|
+ ng-bind="sample.proofing.enterprise.enName"></span>
|
|
|
</div>
|
|
|
</td>
|
|
|
- <td colspan="3">
|
|
|
- <span title="客户名称"
|
|
|
- ng-bind="sample.proofing.enterprise.enName"></span>
|
|
|
- </td>
|
|
|
- <td>
|
|
|
+ <td class="text-center">
|
|
|
<div ng-show="sample.proofing.isCharge == '是'">
|
|
|
总额：<span class="text-num" ng-bind="sample.amount | currency: currency(sample.currency)" style="font-weight: bold;"></span>RMB
|
|
|
</div>
|
|
|
</td>
|
|
|
+ <td></td>
|
|
|
<td colspan="1" class="text-center">
|
|
|
<span ng-if="sample.print" class="label ng-scope operates-status" style="margin-right: 5px;background-color: #5D6C79">已打印</span>
|
|
|
<span ng-if="!sample.print" class="label ng-scope operates-status" style="margin-right: 5px;background-color: #CA3955">未打印</span>
|
|
|
@@ -312,11 +313,11 @@
|
|
|
title="{{sample.qty}}" ng-bind="sample.qty"></div>
|
|
|
<div class="text-muted" ng-bind="sample.proofing.product.unit"></div>
|
|
|
</td>
|
|
|
- <td class="text-center br-l">
|
|
|
+ <td class="text-center">
|
|
|
<div ng-show="sample.proofing.isCharge == '是'">是</div>
|
|
|
<div ng-show="sample.proofing.isCharge != '是'">否</div>
|
|
|
</td>
|
|
|
- <td class="text-center br-l">
|
|
|
+ <td class="text-center">
|
|
|
<div ng-show="sample.proofing.isCharge == '是'" class="text-num">
|
|
|
<span ng-bind="::currency(sample.currency)"></span>
|
|
|
<span ng-bind="::sample.price | number:6"></span>
|
ouxianqin