|
|
@@ -33,6 +33,7 @@
|
|
|
border-radius: 2px;
|
|
|
-webkit-border-radius: 2px;
|
|
|
}
|
|
|
+
|
|
|
.order-table .order-hd {
|
|
|
background: #f5f5f5;
|
|
|
height: 40px;
|
|
|
@@ -42,6 +43,7 @@
|
|
|
.order-table .order-hd td.first {
|
|
|
padding-left: 20px;
|
|
|
}
|
|
|
+
|
|
|
.order-table .order-hd .order-main span {
|
|
|
margin-right: 8px;
|
|
|
}
|
|
|
@@ -81,8 +83,8 @@
|
|
|
padding-left: 20px;
|
|
|
}
|
|
|
|
|
|
-.input-xs,.input-group-xs>.form-control,.input-group-xs>.input-group-addon,.input-group-xs>.input-group-btn>.btn
|
|
|
- {
|
|
|
+.input-xs, .input-group-xs>.form-control, .input-group-xs>.input-group-addon,
|
|
|
+ .input-group-xs>.input-group-btn>.btn {
|
|
|
height: 26px;
|
|
|
padding: 0 5px;
|
|
|
font-size: 12px;
|
|
|
@@ -90,22 +92,25 @@
|
|
|
border-radius: 3px;
|
|
|
}
|
|
|
|
|
|
-.input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn {
|
|
|
+.input-group-xs .form-control:last-child, .input-group-addon:last-child,
|
|
|
+ .input-group-btn:first-child>.btn:not (:first-child ), .input-group-btn:last-child>.btn
|
|
|
+ {
|
|
|
border-top-left-radius: 0;
|
|
|
border-bottom-left-radius: 0;
|
|
|
}
|
|
|
-
|
|
|
</style>
|
|
|
<div class="block">
|
|
|
-<div class="loading in" ng-class="{'in': loading}">
|
|
|
- <i></i>
|
|
|
-</div>
|
|
|
-<div class="condition block">
|
|
|
+ <div class="loading in" ng-class="{'in': loading}">
|
|
|
+ <i></i>
|
|
|
+ </div>
|
|
|
+ <div class="condition block">
|
|
|
<div class="row">
|
|
|
<div class="col-xs-9">
|
|
|
<div class="search">
|
|
|
<div class="form-group form-group-sm has-feedback">
|
|
|
- <input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
|
|
|
+ <input type="search" class="form-control input-sm"
|
|
|
+ ng-model="keyword" ng-search="onSearch()"
|
|
|
+ placeholder="输入商品名称、单据流水号搜索" /><span
|
|
|
class="form-control-feedback text-simple"><i
|
|
|
class="fa fa-search"></i></span>
|
|
|
</div>
|
|
|
@@ -118,31 +123,34 @@
|
|
|
</div>
|
|
|
<div class="col-xs-2 toggle">
|
|
|
<a ng-click="condition.$open=!condition.$open" class="text-simple">
|
|
|
- <span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
|
|
|
- <i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
|
|
|
+ <span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span> <i
|
|
|
+ class="fa fa-fw"
|
|
|
+ ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
|
|
|
</a>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="more" ng-class="{'open': condition.$open}">
|
|
|
<form class="form-inline">
|
|
|
- <div class="form-group ">
|
|
|
- <label>日期:</label>
|
|
|
- <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
|
|
|
- <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
|
|
|
- {{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
|
|
|
- </button>
|
|
|
- <ul class="dropdown-menu">
|
|
|
- <li><a ng-click="changeDateZone(1)">一个月内</a></li>
|
|
|
- <li><a ng-click="changeDateZone(6)">半年内</a></li>
|
|
|
- <li><a ng-click="changeDateZone()">半年前</a></li>
|
|
|
- </ul>
|
|
|
- </div>
|
|
|
- <div class="form-group input-group input-group-xs input-trigger">
|
|
|
+ <div class="form-group ">
|
|
|
+ <label>日期:</label>
|
|
|
+ <div class="btn-group btn-menu" dropdown
|
|
|
+ is-open="condition.$dateZoneOpen">
|
|
|
+ <button type="button" dropdown-toggle style="width: 85px;"
|
|
|
+ class="btn btn-default btn-xs dropdown-toggle">
|
|
|
+ {{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
|
|
|
+ </button>
|
|
|
+ <ul class="dropdown-menu">
|
|
|
+ <li><a ng-click="changeDateZone(1)">一个月内</a></li>
|
|
|
+ <li><a ng-click="changeDateZone(6)">半年内</a></li>
|
|
|
+ <li><a ng-click="changeDateZone()">半年前</a></li>
|
|
|
+ </ul>
|
|
|
+ </div>
|
|
|
+ <div class="form-group input-group input-group-xs input-trigger">
|
|
|
<input type="text" ng-model="condition.dateFrom"
|
|
|
class="form-control" placeholder="从"
|
|
|
datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
|
|
|
- ng-required="true"
|
|
|
- current-text="今天" clear-text="清除" close-text="关闭"
|
|
|
+ ng-required="true" current-text="今天" clear-text="清除"
|
|
|
+ close-text="关闭"
|
|
|
datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
|
|
|
ng-focus="openDatePicker($event, condition, '$fromOpened')">
|
|
|
<span class="input-group-btn">
|
|
|
@@ -156,8 +164,8 @@
|
|
|
<input type="text" ng-model="condition.dateTo"
|
|
|
class="form-control" placeholder="到"
|
|
|
datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
|
|
|
- ng-required="true"
|
|
|
- current-text="今天" clear-text="清除" close-text="关闭"
|
|
|
+ ng-required="true" current-text="今天" clear-text="清除"
|
|
|
+ close-text="关闭"
|
|
|
datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
|
|
|
ng-focus="openDatePicker($event, condition, '$toOpened')">
|
|
|
<span class="input-group-btn">
|
|
|
@@ -167,104 +175,110 @@
|
|
|
</button>
|
|
|
</span>
|
|
|
</div>
|
|
|
- </div>
|
|
|
+ </div>
|
|
|
</form>
|
|
|
</div>
|
|
|
</div>
|
|
|
-<table class="order-table block" ng-table="tableParams">
|
|
|
- <thead>
|
|
|
- <tr class="header">
|
|
|
- <th>商品</th>
|
|
|
- <th width="120">单价</th>
|
|
|
- <th width="100">验收数量</th>
|
|
|
- <th width="120">入库批号</th>
|
|
|
- <th width="140">单据信息</th>
|
|
|
- <th width="70">操作</th>
|
|
|
- </tr>
|
|
|
- <tr class="sep-row">
|
|
|
- <td colspan="6"></td>
|
|
|
- </tr>
|
|
|
- <tr class="toolbar toolbar-top">
|
|
|
- <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)"
|
|
|
- class="btn btn-default btn-xs">批量处理</a>
|
|
|
- </div> <!-- 分页 -->
|
|
|
- </td>
|
|
|
- <td class="text-center">
|
|
|
- <a href="sale/accept/xls?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="6"></td>
|
|
|
- </tr>
|
|
|
- </thead>
|
|
|
- <tbody ng-repeat="accept in $data">
|
|
|
- <tr class="order-hd">
|
|
|
- <td class="first">
|
|
|
- <div class="order-main">
|
|
|
- <span><input type="checkbox" class="selector" ng-model="accept.$selected"></span>
|
|
|
- <span class="text-num text-bold" title="{{accept.date | date:'yyyy年MM月dd日hh:mm'}}" ng-bind="accept.date | date:'yyyy-MM-dd'"></span>
|
|
|
- <span>流水号:<a class="text-num" ng-bind="accept.code"></a></span>
|
|
|
- </div>
|
|
|
- </td>
|
|
|
- <td colspan="3"><a title="客户名称"
|
|
|
- ng-bind="accept.acceptItems[0].orders.enterprise.enName"></a></td>
|
|
|
- <td colspan="1" class="order-sum">
|
|
|
- <div class="text-ellipsis" ng-if="accept.sendCode != null" style="width: 120px;" title="送货单号:{{::accept.sendCode}}" >
|
|
|
- <i style="color: #CC9933;" class="fa fa-truck"></i>
|
|
|
- <span ng-bind="accept.sendCode"></span>
|
|
|
- </div>
|
|
|
- </td>
|
|
|
- <td colspan="1" class="text-center">
|
|
|
- <div class="operates">
|
|
|
- <!-- <a href="#" class="text-muted" title="打印">
|
|
|
+ <table class="order-table block" ng-table="tableParams">
|
|
|
+ <thead>
|
|
|
+ <tr class="header">
|
|
|
+ <th>商品</th>
|
|
|
+ <th width="120">单价</th>
|
|
|
+ <th width="100">验收数量</th>
|
|
|
+ <th width="120">入库批号</th>
|
|
|
+ <th width="140">单据信息</th>
|
|
|
+ <th width="70">操作</th>
|
|
|
+ </tr>
|
|
|
+ <tr class="sep-row">
|
|
|
+ <td colspan="6"></td>
|
|
|
+ </tr>
|
|
|
+ <tr class="toolbar toolbar-top">
|
|
|
+ <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)"
|
|
|
+ class="btn btn-default btn-xs">批量处理</a>
|
|
|
+ </div> <!-- 分页 -->
|
|
|
+ </td>
|
|
|
+ <td class="text-center"><a
|
|
|
+ href="sale/accept/xls?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="6"></td>
|
|
|
+ </tr>
|
|
|
+ </thead>
|
|
|
+ <tbody ng-repeat="accept in $data">
|
|
|
+ <tr class="order-hd">
|
|
|
+ <td class="first">
|
|
|
+ <div class="order-main">
|
|
|
+ <span><input type="checkbox" class="selector"
|
|
|
+ ng-model="accept.$selected"></span> <span
|
|
|
+ class="text-num text-bold"
|
|
|
+ title="{{accept.date | date:'yyyy年MM月dd日hh:mm'}}"
|
|
|
+ ng-bind="accept.date | date:'yyyy-MM-dd'"></span> <span>流水号:<a
|
|
|
+ class="text-num" ng-bind="accept.code"></a></span>
|
|
|
+ </div>
|
|
|
+ </td>
|
|
|
+ <td colspan="3"><a title="客户名称"
|
|
|
+ ng-bind="accept.acceptItems[0].order.enterprise.enName"></a></td>
|
|
|
+ <td colspan="1" class="order-sum">
|
|
|
+ <div class="text-ellipsis" ng-if="accept.sendCode != null"
|
|
|
+ style="width: 120px;" title="送货单号:{{::accept.sendCode}}">
|
|
|
+ <i style="color: #CC9933;" class="fa fa-truck"></i> <span
|
|
|
+ ng-bind="accept.sendCode"></span>
|
|
|
+ </div>
|
|
|
+ </td>
|
|
|
+ <td colspan="1" class="text-center">
|
|
|
+ <div class="operates">
|
|
|
+ <!-- <a href="#" class="text-muted" title="打印">
|
|
|
<i class="fa fa-print fa-lg fa-fw"></i>
|
|
|
</a> -->
|
|
|
- </div>
|
|
|
- </td>
|
|
|
- </tr>
|
|
|
- <tr class="order-bd" ng-repeat="item in accept.acceptItems">
|
|
|
- <td class="product">
|
|
|
- <div class="text-num text-bold">
|
|
|
- <a ng-bind="item.orders.product.code"></a>
|
|
|
- </div>
|
|
|
- <div>
|
|
|
- <a ng-bind="item.orders.product.title"></a>
|
|
|
- </div>
|
|
|
- <div class="text-muted" title="{{item.orders.product.spec}}"
|
|
|
- ng-bind="item.orders.product.spec">
|
|
|
- </div>
|
|
|
- </td>
|
|
|
- <td class="text-center">
|
|
|
- <div class="text-num"
|
|
|
- title="{{item.orderPrice}}">
|
|
|
- <span ng-bind="::currency(accept.currency)"></span><span ng-bind="item.orderPrice | number : 6"></span>
|
|
|
- </div>
|
|
|
- <div class="text-muted"
|
|
|
- title="{{item.orders.taxrate}}%">
|
|
|
- <br>
|
|
|
- 税率:<span ng-bind="::item.orders.taxrate + '%'" class="text-num"></span>
|
|
|
- </div>
|
|
|
- </td>
|
|
|
-
|
|
|
- <td class="text-center">
|
|
|
- <div class="text-num text-bold"
|
|
|
- title="{{item.qty}}" ng-bind="item.qty"></div>
|
|
|
- <div class="text-muted" ng-bind="item.orders.product.unit"></div>
|
|
|
- </td>
|
|
|
- <td class="text-center br-l">
|
|
|
- <div class="text-num"
|
|
|
- ng-bind="item.batchCode"></div>
|
|
|
- </td>
|
|
|
- <td class="br-l" colspan="2">
|
|
|
- <div>单据编号:<a ui-sref="make.order_detail({id:item.orders.id})" ng-bind="item.orders.code"></a></div>
|
|
|
- <div>
|
|
|
- 数量:<span ng-bind="item.orders.qty"></span>
|
|
|
- </div>
|
|
|
- </td>
|
|
|
- </tr>
|
|
|
- </tbody>
|
|
|
-</table>
|
|
|
+ </div>
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ <tr class="order-bd" ng-repeat="item in accept.acceptItems">
|
|
|
+ <td class="product">
|
|
|
+ <div class="text-num text-bold">
|
|
|
+ <a ng-bind="item.order.product.code"></a>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <a ng-bind="item.order.product.title"></a>
|
|
|
+ </div>
|
|
|
+ <div class="text-muted" title="{{item.order.product.spec}}"
|
|
|
+ ng-bind="item.order.product.spec"></div>
|
|
|
+ </td>
|
|
|
+ <td class="text-center">
|
|
|
+ <div class="text-num" title="{{item.orderPrice}}">
|
|
|
+ <span ng-bind="::currency(accept.currency)"></span><span
|
|
|
+ ng-bind="item.orderPrice | number : 6"></span>
|
|
|
+ </div>
|
|
|
+ <div class="text-muted" title="{{item.order.taxrate}}%">
|
|
|
+ <br> 税率:<span ng-bind="::item.order.taxrate + '%'"
|
|
|
+ class="text-num"></span>
|
|
|
+ </div>
|
|
|
+ </td>
|
|
|
+
|
|
|
+ <td class="text-center">
|
|
|
+ <div class="text-num text-bold" title="{{item.qty}}"
|
|
|
+ ng-bind="item.qty"></div>
|
|
|
+ <div class="text-muted" ng-bind="item.order.product.unit"></div>
|
|
|
+ </td>
|
|
|
+ <td class="text-center br-l">
|
|
|
+ <div class="text-num" ng-bind="item.batchCode"></div>
|
|
|
+ </td>
|
|
|
+ <td class="br-l" colspan="2">
|
|
|
+ <div>
|
|
|
+ 单据编号:<a ui-sref="make.order_detail({id:item.order.id})"
|
|
|
+ ng-bind="item.order.code"></a>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ 数量:<span ng-bind="item.order.qty"></span>
|
|
|
+ </div>
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ </tbody>
|
|
|
+ </table>
|
|
|
</div>
|