采购验退单详情

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9391 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/tpl/index/sale/return_detail.html

@@ -0,0 +1,158 @@
+<style>
+    .p-right em{
+        font-style: normal;
+    }
+    .p-right .fr{
+        font-size: 14px;
+        color: #959595;
+        margin-right: 20px;
+    }
+    .p-right span.fr em {
+        margin-right: 50px;
+        font-size: 14px;
+    }
+    .sale-content{
+        width: 100%;
+        margin: 0 auto;
+        background: #fff;
+        padding: 20px 0;
+    }
+    .sale-content .row{
+        line-height: 34px;
+        font-size: 14px;
+        margin-left: 0px;
+        margin-right: 0px;
+        padding-left: 15px;
+        padding-right: 15px;
+    }
+    .sale-content .row .title{
+        width: 75px;
+        float: left;
+        color: #959595;
+    }
+    .sale-content .row .content{
+        text-align: left;
+    }
+    .sale-tab{
+        width: 95%;
+        margin: 0 auto;
+        margin-top: 20px;
+    }
+    .sale-tab .table{
+        margin-bottom: 0;
+        border: #cfcfcf 1px solid;
+    }
+    .sale-tab .table thead tr{
+        height: 30px;
+        background: #ebf5fe;
+    }
+    .sale-tab .table thead tr th{
+        border-bottom: none;
+        vertical-align: middle;
+        font-weight: normal;
+        font-size: 14px;
+        position: relative;
+    }
+    .sale-tab .table thead tr th em{
+        font-style: inherit;
+        float: right;
+        color: #9f9fa0;
+        position: absolute;
+        right: 2px;
+    }
+    .sale-tab .table tbody tr{
+        height: 40px;
+    }
+    .sale-tab .table tbody tr td{
+        border-bottom: #cfcfcf 1px solid;
+        border-top: none;
+        vertical-align: middle;
+        font-size: 12px;
+    }
+    .sale-tab .table tbody tr:last-child td{
+        border-bottom: none;
+    }
+</style>
+<div class="ng-scope" style="width: 1170px; margin-left: -240px;">
+    <div class="pub-com_head">
+        <span>客户采购验退单</span>
+        <div class="p-right">
+            <!-- <span class="fr"><em class="ng-binding">录入人：{{::inquiryItem.inquiry.recorder}}</em><time class="ng-binding">日期：{{::inquiryItem.inquiry.date | date :'yyyy-MM-dd HH:mm'}}</time></span>-->
+        </div>
+    </div>
+    <div class="sale-content">
+        <div class="row">
+            <div class="col-md-3">
+                <span class="title">验退单号：</span>
+                <span class="content" ng-bind="::returns.code"></span>
+            </div>
+            <div class="col-md-4">
+                <span class="title">客户名称：</span>
+                <span class="content" ng-bind="::returns.receivename"></span>
+            </div>
+            <div class="col-md-2">
+                <span class="title">验退日期：</span>
+                <span class="content" ng-bind="::returns.date | date: 'yyyy-mm-dd'"></span>
+            </div>
+            <div class="col-md-3">
+                <span class="title" style="width: 90px;">应付供应商：</span>
+                <span class="content" ng-bind="::returns.receivename"></span>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-3">
+                <span class="title">送货单号：</span>
+                <span class="content" ng-bind="::returns.sendCode"></span>
+            </div>
+            <div class="col-md-4">
+                <span class="title">付款方式：</span>
+                <span class="content" ng-bind="::returns.payments"></span>
+            </div>
+            <div class="col-md-2">
+                <span class="title">币&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;种：</span>
+                <span class="content" ng-bind="::returns.currency"></span>
+            </div>
+            <div class="col-md-3">
+                <span class="title" style="width: 90px;">金&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;额：</span>
+                <span class="content"></span>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-md-12">
+                <span class="title">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注：</span>
+                <span class="content" ng-bind="::returns.remark"></span>
+            </div>
+        </div>
+        <!--表单-->
+        <div class="sale-tab">
+            <table class="table">
+                <thead>
+                    <tr>
+                        <th width="50">序号<em>|</em></th>
+                        <th width="180">客户采购单号<em>|</em></th>
+                        <th>产品<em>|</em></th>
+                        <th width="150">品牌<em>|</em></th>
+                        <th width="90">单位<em>|</em></th>
+                        <th width="100">单价<em>|</em></th>
+                        <th width="100">入库数<em>|</em></th>
+                        <th width="100">金额<em>|</em></th>
+                        <th width="130">批号</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr ng-repeat="returnitem in return.returnItems| orderBy:'number'">
+                        <td><span ng-bind="::returnitem.number"></span></td>
+                        <td><span ng-bind="::returnitem.orderItem.order.code"></span></td>
+                        <td><span ng-bind="::returnitem.product.title"></span></td>
+                        <td><span ng-bind="::returnitem.product.brand"></span></td>
+                        <td><span ng-bind="::returnitem.product.unit"></span></td>
+                        <td><span ng-bind="::returnitem.orderItem.price"></span></td>
+                        <td><span ng-bind="::returnitem.acceptQty"></span></td>
+                        <td>{{returnitem.acceptQty*returnitem.orderItem.price| number: 6}}</td>
+                        <td><span ng-bind="::returnitem.batchCode"></span></td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>

src/main/webapp/resources/tpl/index/sale/returns.html

@@ -225,13 +225,11 @@
 						</span> --><span class="text-num text-bold"
 							title="{{::returns.date | date: 'yyyy年MM月dd日 hh:mm'}}"
 							ng-bind="::returns.date | date:'yyyy-MM-dd'"></span>
-						<span
-								title="客户名称"
+						<span title="客户名称"
 								ng-bind="::returns.returnItems[0].orderItem.order.enterprise.enName" ng-if="returns.returnItems[0].orderItem"></span>
-						<span
-								title="客户名称">{{returns.enName}}</span>
-						<span>流水号：<span
-							class="text-num" ng-bind="::returns.code" ng-if="!returns.returnItems[0].orderItem"></span></span>
+						<span title="客户名称">{{returns.enName}}</span>
+						<span>流水号：<a
+							class="text-num" ng-bind="::returns.code" ng-if="!returns.returnItems[0].orderItem" ui-sref="sale.return_detail({id: returns.id})"></a></span>
 					</div>
 				</td>
 				<td colspan="1" class="order-sum">