|
|
@@ -235,18 +235,17 @@
|
|
|
<thead>
|
|
|
<tr class="header">
|
|
|
<th>商品</th>
|
|
|
- <th width="120">需求数量</th>
|
|
|
+ <th width="120">数量</th>
|
|
|
<th width="80">是否收费</th>
|
|
|
<th width="100">单价</th>
|
|
|
- <th width="120">交货日期</th>
|
|
|
- <th width="180">客户单据</th>
|
|
|
+ <th width="120">需求日期</th>
|
|
|
<th width="70">操作</th>
|
|
|
</tr>
|
|
|
<tr class="sep-row">
|
|
|
- <td colspan="6"></td>
|
|
|
+ <td colspan="5"></td>
|
|
|
</tr>
|
|
|
<tr class="toolbar toolbar-top">
|
|
|
- <td colspan="6">
|
|
|
+ <td colspan="5">
|
|
|
<!--<div>
|
|
|
<label><input ng-disabled="true" type="checkbox" class="selector select_all"
|
|
|
ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
|
|
|
@@ -267,14 +266,16 @@
|
|
|
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>
|
|
|
</div>
|
|
|
</td>
|
|
|
- <td colspan="4"><span title="客户名称"
|
|
|
+ <td colspan="3">
|
|
|
+ <span title="客户名称"
|
|
|
ng-bind="sample.proofing.enterprise.enName"></span>
|
|
|
</td>
|
|
|
<td>
|
|
|
<div ng-show="sample.proofing.isCharge == '是'">
|
|
|
- 总额：<span class="text-num" ng-bind="sample.amount | currency: currency(sample.currency)"></span>
|
|
|
+ 总额：<span class="text-num" ng-bind="sample.amount | currency: currency(sample.currency)" style="font-weight: bold;"></span>RMB
|
|
|
</div>
|
|
|
</td>
|
|
|
<td colspan="1" class="text-center">
|
|
|
@@ -298,7 +299,12 @@
|
|
|
<div class="text-muted" title="{{sample.proofing.product.spec}}"
|
|
|
ng-bind="sample.proofing.product.spec"></div>
|
|
|
<div ng-if="sample.proofing.envrequiry" title="环保要求">
|
|
|
- <i class="fa fa-tree fa-fw" style="color: #33CC33;"></i> 环保要求：<span ng-bind="::sample.proofing.envrequiry"></span>
|
|
|
+ <i class="fa fa-tree fa-fw" style="color: #33CC33; font-size: 18px;"></i> 环保要求：<span ng-bind="::sample.proofing.envrequiry"></span>
|
|
|
+ </div>
|
|
|
+ <div ng-if="sample.proofing.attachs.length > 0">
|
|
|
+ <div ng-repeat="attach in sample.proofing.attachs">
|
|
|
+ <i class="fa fa-paperclip fa-fw" style="color: #ffa340; font-size: 18px;"></i>附件：<a class="file" href="file/{{attach.id}}" ng-bind="::attach.name"></a>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</td>
|
|
|
<td class="text-center">
|
|
|
@@ -362,17 +368,6 @@
|
|
|
</div>
|
|
|
|
|
|
</td>
|
|
|
- <td class="br-l">
|
|
|
- <div><span>编号：<a class="text-num" ng-bind="::sample.proofing.code"
|
|
|
- ui-sref="sale.sample_detail({id:sample.id})" target="_self"></a></span></div>
|
|
|
- <!--<div>第 <span ng-bind="sample.number"></span> 行</div>-->
|
|
|
- <!--<div>附件：<span ng-if="sample.proofing.attachs.length == 0">无</span></div>-->
|
|
|
- <div ng-if="sample.proofing.attachs.length > 0">
|
|
|
- <div ng-repeat="attach in sample.proofing.attachs">
|
|
|
- <a class="file" href="file/{{attach.id}}" ng-bind="::attach.name"></a>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </td>
|
|
|
<td class="br-l text-center">
|
|
|
<div class="operates" ng-show="sample.status == 401">
|
|
|
<a ng-click="openSend($index, sample)" class="text-muted" title="送样">
|
ouxianqin