|
|
@@ -1,234 +1,237 @@
|
|
|
<style>
|
|
|
-.order-table .header>th {
|
|
|
- height: 38px;
|
|
|
- text-align: center;
|
|
|
- background: #f5f5f5;
|
|
|
- border-top: 1px solid #e8e8e8;
|
|
|
- border-bottom: 1px solid #e8e8e8;
|
|
|
-}
|
|
|
+ .order-table .header>th {
|
|
|
+ height: 38px;
|
|
|
+ text-align: center;
|
|
|
+ background: #f5f5f5;
|
|
|
+ border-top: 1px solid #e8e8e8;
|
|
|
+ border-bottom: 1px solid #e8e8e8;
|
|
|
+ }
|
|
|
|
|
|
-.order-table .sep-row {
|
|
|
- height: 10px;
|
|
|
-}
|
|
|
+ .order-table .sep-row {
|
|
|
+ height: 10px;
|
|
|
+ }
|
|
|
|
|
|
-.order-table .selector {
|
|
|
- vertical-align: middle;
|
|
|
- margin: 0 0 2px 0;
|
|
|
-}
|
|
|
+ .order-table .selector {
|
|
|
+ vertical-align: middle;
|
|
|
+ margin: 0 0 2px 0;
|
|
|
+ }
|
|
|
|
|
|
-.toolbar label {
|
|
|
- margin-right: 10px;
|
|
|
- margin-bottom: 0;
|
|
|
-}
|
|
|
+ .toolbar label {
|
|
|
+ margin-right: 10px;
|
|
|
+ margin-bottom: 0;
|
|
|
+ }
|
|
|
|
|
|
-.toolbar .select_all {
|
|
|
- margin: 0 6px 0 10px;
|
|
|
- line-height: 20px;
|
|
|
-}
|
|
|
+ .toolbar .select_all {
|
|
|
+ margin: 0 6px 0 10px;
|
|
|
+ line-height: 20px;
|
|
|
+ }
|
|
|
|
|
|
-.toolbar .btn {
|
|
|
- -moz-border-radius: 2px;
|
|
|
- margin-right: 5px;
|
|
|
- border: 1px solid #dcdcdc;
|
|
|
- border-radius: 2px;
|
|
|
- -webkit-border-radius: 2px;
|
|
|
-}
|
|
|
+ .toolbar .btn {
|
|
|
+ -moz-border-radius: 2px;
|
|
|
+ margin-right: 5px;
|
|
|
+ border: 1px solid #dcdcdc;
|
|
|
+ border-radius: 2px;
|
|
|
+ -webkit-border-radius: 2px;
|
|
|
+ }
|
|
|
|
|
|
-.order-table .order-hd {
|
|
|
- background: #f5f5f5;
|
|
|
- height: 40px;
|
|
|
- line-height: 40px;
|
|
|
-}
|
|
|
+ .order-table .order-hd {
|
|
|
+ background: #f5f5f5;
|
|
|
+ height: 40px;
|
|
|
+ line-height: 40px;
|
|
|
+ }
|
|
|
|
|
|
-.order-table .order-hd td.first {
|
|
|
- padding-left: 20px;
|
|
|
-}
|
|
|
+ .order-table .order-hd td.first {
|
|
|
+ padding-left: 20px;
|
|
|
+ }
|
|
|
|
|
|
-.order-table .order-hd .order-main span {
|
|
|
- margin-right: 8px;
|
|
|
-}
|
|
|
+ .order-table .order-hd .order-main span {
|
|
|
+ margin-right: 8px;
|
|
|
+ }
|
|
|
|
|
|
-.order-table .order-hd .order-code {
|
|
|
- font-style: normal;
|
|
|
- font-family: verdana;
|
|
|
-}
|
|
|
+ .order-table .order-hd .order-code {
|
|
|
+ font-style: normal;
|
|
|
+ font-family: verdana;
|
|
|
+ }
|
|
|
|
|
|
-.order-table .order-hd .order-sum {
|
|
|
- padding: 0 5px;
|
|
|
-}
|
|
|
+ .order-table .order-hd .order-sum {
|
|
|
+ padding: 0 5px;
|
|
|
+ }
|
|
|
|
|
|
-.order-table>tbody {
|
|
|
- border: 1px solid transparent;
|
|
|
-}
|
|
|
+ .order-table>tbody {
|
|
|
+ border: 1px solid transparent;
|
|
|
+ }
|
|
|
|
|
|
-.order-table>tbody:hover {
|
|
|
- border-color: #56a022;
|
|
|
- border-width: 2px;
|
|
|
-}
|
|
|
+ .order-table>tbody:hover {
|
|
|
+ border-color: #56a022;
|
|
|
+ border-width: 2px;
|
|
|
+ }
|
|
|
|
|
|
-.order-table .order-info {
|
|
|
- padding-left: 21px;
|
|
|
-}
|
|
|
+ .order-table .order-info {
|
|
|
+ padding-left: 21px;
|
|
|
+ }
|
|
|
|
|
|
-.order-table .operates {
|
|
|
- display: none;
|
|
|
-}
|
|
|
+ .order-table .operates {
|
|
|
+ display: none;
|
|
|
+ }
|
|
|
|
|
|
-.order-table>tbody:hover .operates {
|
|
|
- display: block;
|
|
|
-}
|
|
|
+ .order-table>tbody:hover .operates {
|
|
|
+ display: block;
|
|
|
+ }
|
|
|
|
|
|
-.order-table .order-bd {
|
|
|
- border-bottom: 1px solid #e6e6e6;
|
|
|
-}
|
|
|
+ .order-table .order-bd {
|
|
|
+ border-bottom: 1px solid #e6e6e6;
|
|
|
+ }
|
|
|
|
|
|
-.order-table .order-bd>td {
|
|
|
- padding: 10px 5px;
|
|
|
- vertical-align: top;
|
|
|
- position: relative;
|
|
|
-}
|
|
|
+ .order-table .order-bd>td {
|
|
|
+ padding: 10px 5px;
|
|
|
+ vertical-align: top;
|
|
|
+ position: relative;
|
|
|
+ }
|
|
|
|
|
|
-.order-table .order-bd .product {
|
|
|
- padding-left: 20px;
|
|
|
-}
|
|
|
+ .order-table .order-bd .product {
|
|
|
+ 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;
|
|
|
- line-height: 1.5;
|
|
|
- border-radius: 3px;
|
|
|
-}
|
|
|
+ height: 26px;
|
|
|
+ padding: 0 5px;
|
|
|
+ font-size: 12px;
|
|
|
+ line-height: 1.5;
|
|
|
+ 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 {
|
|
|
- border-top-left-radius: 0;
|
|
|
- border-bottom-left-radius: 0;
|
|
|
+ .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;
|
|
|
+ }
|
|
|
+/*.border-two{
|
|
|
+ background: #fff !important;
|
|
|
}
|
|
|
-
|
|
|
+.border-two td{
|
|
|
+ border-bottom: #e8e8e8 1px solid;
|
|
|
+}*/
|
|
|
</style>
|
|
|
<link rel="stylesheet" href="static/css/public.css">
|
|
|
<div class="block" id="public">
|
|
|
-<div class="loading in" ng-class="{'in': loading}">
|
|
|
- <i></i>
|
|
|
-</div>
|
|
|
-<div class="menu condition block">
|
|
|
+ <div class="loading in" ng-class="{'in': loading}">
|
|
|
+ <i></i>
|
|
|
+ </div>
|
|
|
+ <div class="menu condition block">
|
|
|
<div class="row">
|
|
|
<div class="col-xs-4">
|
|
|
<div class="btn-group btn-group-sm btn-group-justified">
|
|
|
<div class="btn-group btn-group-sm">
|
|
|
<button type="button" class="btn btn-default btn-line"
|
|
|
- ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
|
|
|
+ ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
|
|
|
</div>
|
|
|
-
|
|
|
<div class="btn-group btn-group-sm">
|
|
|
<button type="button" class="btn btn-default btn-line"
|
|
|
- ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">未收料</button>
|
|
|
+ ng-class="{'btn-info':active=='done'}" ng-click="setActive('done')">已收料</button>
|
|
|
</div>
|
|
|
<div class="btn-group btn-group-sm">
|
|
|
<button type="button" class="btn btn-default btn-line"
|
|
|
- ng-class="{'btn-info':active=='done'}" ng-click="setActive('done')">已收料</button>
|
|
|
+ ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">未收料</button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
-<div class="height10"> </div>
|
|
|
-<div class="condition block">
|
|
|
- <div class="search-bg condition block">
|
|
|
- <div class="row">
|
|
|
- <div id="topSearch" style="float: left">
|
|
|
- <span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
|
|
|
- 单据{{tableParams.total()}}条
|
|
|
- </div>
|
|
|
- <div class="col-xs-6">
|
|
|
- <div class="search">
|
|
|
- <div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
|
|
|
- <input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" />
|
|
|
- <a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
|
|
|
+ <div class="height10"> </div>
|
|
|
+ <div class="condition block">
|
|
|
+ <div class="search-bg condition block">
|
|
|
+ <div class="row">
|
|
|
+ <div id="topSearch" style="float: left">
|
|
|
+ <span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
|
|
|
+ 单据{{tableParams.total()}}条
|
|
|
+ </div>
|
|
|
+ <div class="col-xs-6">
|
|
|
+ <div class="search">
|
|
|
+ <div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
|
|
|
+ <input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" />
|
|
|
+ <a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div class="fr 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></a>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- <div class="fr 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></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">
|
|
|
- <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="关闭"
|
|
|
- datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
|
|
|
- ng-focus="openDatePicker($event, condition, '$fromOpened')">
|
|
|
- <span class="input-group-btn">
|
|
|
+ <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">
|
|
|
+ <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="关闭"
|
|
|
+ datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
|
|
|
+ ng-focus="openDatePicker($event, condition, '$fromOpened')">
|
|
|
+ <span class="input-group-btn">
|
|
|
<button type="button" class="btn btn-default"
|
|
|
ng-click="openDatePicker($event, condition, '$fromOpened')">
|
|
|
<i class="fa fa-calendar"></i>
|
|
|
</button>
|
|
|
</span>
|
|
|
- </div>
|
|
|
- <div class="form-group input-group input-group-xs input-trigger">
|
|
|
- <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="关闭"
|
|
|
- datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
|
|
|
- ng-focus="openDatePicker($event, condition, '$toOpened')">
|
|
|
- <span class="input-group-btn">
|
|
|
+ </div>
|
|
|
+ <div class="form-group input-group input-group-xs input-trigger">
|
|
|
+ <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="关闭"
|
|
|
+ datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
|
|
|
+ ng-focus="openDatePicker($event, condition, '$toOpened')">
|
|
|
+ <span class="input-group-btn">
|
|
|
<button type="button" class="btn btn-default"
|
|
|
ng-click="openDatePicker($event, condition, '$toOpened')">
|
|
|
<i class="fa fa-calendar"></i>
|
|
|
</button>
|
|
|
</span>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <!--<div class="form-group">
|
|
|
- <label>采纳结果：</label>
|
|
|
- <div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
|
|
|
- <button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
|
|
|
- {{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
|
|
|
- </button>
|
|
|
- <ul class="dropdown-menu">
|
|
|
- <li><a ng-click="changeAgreed()">全部</a></li>
|
|
|
- <li><a ng-click="changeAgreed(1)">已采纳</a></li>
|
|
|
- <li><a ng-click="changeAgreed(0)">未采纳</a></li>
|
|
|
- </ul>
|
|
|
- </div>
|
|
|
- </div>-->
|
|
|
- </form>
|
|
|
+ <!--<div class="form-group">
|
|
|
+ <label>采纳结果：</label>
|
|
|
+ <div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
|
|
|
+ <button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
|
|
|
+ {{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
|
|
|
+ </button>
|
|
|
+ <ul class="dropdown-menu">
|
|
|
+ <li><a ng-click="changeAgreed()">全部</a></li>
|
|
|
+ <li><a ng-click="changeAgreed(1)">已采纳</a></li>
|
|
|
+ <li><a ng-click="changeAgreed(0)">未采纳</a></li>
|
|
|
+ </ul>
|
|
|
+ </div>
|
|
|
+ </div>-->
|
|
|
+ </form>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
-</div>
|
|
|
-<table class="order-table block" ng-table="tableParams">
|
|
|
- <thead>
|
|
|
+ <table class="order-table block" ng-table="tableParams">
|
|
|
+ <thead>
|
|
|
<tr class="header">
|
|
|
- <th width="500">商品</th>
|
|
|
- <th width="180">商品价格</th>
|
|
|
+ <th width="500">产品</th>
|
|
|
<th width="120">发货数量</th>
|
|
|
- <th width="140">单据信息</th>
|
|
|
+ <th width="140">订单信息</th>
|
|
|
<th width="70">操作</th>
|
|
|
</tr>
|
|
|
<tr class="sep-row">
|
|
|
- <td colspan="5"></td>
|
|
|
+ <td colspan="4"></td>
|
|
|
</tr>
|
|
|
<tr class="toolbar toolbar-top">
|
|
|
- <td colspan="4">
|
|
|
+ <td colspan="3">
|
|
|
<!--<div>
|
|
|
<label><input ng-disabled="true" type="checkbox" class="selector select_all"
|
|
|
ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
|
|
|
@@ -241,23 +244,21 @@
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr class="sep-row">
|
|
|
- <td colspan="5"></td>
|
|
|
+ <td colspan="4"></td>
|
|
|
</tr>
|
|
|
- </thead>
|
|
|
- <tbody ng-repeat="send in $data">
|
|
|
+ </thead>
|
|
|
+ <tbody ng-repeat="send in $data">
|
|
|
<tr class="order-hd">
|
|
|
- <td class="first">
|
|
|
+ <td class="first" colspan="2">
|
|
|
<div class="order-main">
|
|
|
<!--<span><input type="checkbox" class="selector"
|
|
|
ng-model="send.$selected">
|
|
|
</span> -->
|
|
|
- <span class="text-num text-bold" title="{{::send.date | date: 'yyyy年MM月dd日 hh:mm'}}"
|
|
|
- ng-bind="send.date | date:'yyyy-MM-dd'"></span> <span>发货单号：<a
|
|
|
- class="text-num" ng-bind="::send.code" ui-sref="sale.send_detail({id:send.id})"></a></span>
|
|
|
+ <span class="text-num text-bold" title="{{::send.date | date: 'yyyy年MM月dd日 hh:mm'}}" ng-bind="send.date | date:'yyyy-MM-dd'"></span>
|
|
|
+ <span title="客户名称" ng-bind="::send.sendItems[0].orderItem.order.enterprise.enName"></span>
|
|
|
+ <span>发货单号：<a class="text-num" ng-bind="::send.code" ui-sref="sale.send_detail({id:send.id})"></a></span>
|
|
|
</div>
|
|
|
</td>
|
|
|
- <td colspan="2"><span title="客户名称"
|
|
|
- ng-bind="::send.sendItems[0].orderItem.order.enterprise.enName"></span></td>
|
|
|
<td colspan="1" class="order-sum">
|
|
|
<span ng-if="send.recorder != null" title="录入人"> <i style="color: #339999;" class="fa fa-user"></i> <span ng-bind="::send.recorder"></span></span>
|
|
|
</td>
|
|
|
@@ -269,12 +270,12 @@
|
|
|
</div>
|
|
|
</td>
|
|
|
</tr>
|
|
|
- <tr class="order-hd" ng-if="send.sendItems[0].orderItem.order.shipAddress">
|
|
|
- <td colspan="5" class="order-info">
|
|
|
+ <tr class="border-two order-hd" ng-if="send.sendItems[0].orderItem.order.shipAddress">
|
|
|
+ <td colspan="4" class="order-info">
|
|
|
<span><span class="text-bold">收货地址：</span>
|
|
|
<span ng-bind="::send.sendItems[0].orderItem.order.shipAddress"></span>
|
|
|
</span>
|
|
|
- <span ng-if="send.remark"> <span class="text-bold">备注：</span>
|
|
|
+ <span ng-if="send.remark"> <span class="text-bold">备注：</span>
|
|
|
<span ng-bind="::send.remark"></span>
|
|
|
</span>
|
|
|
</td>
|
|
|
@@ -288,20 +289,8 @@
|
|
|
<span ng-bind="::item.orderItem.product.title"></span>
|
|
|
</div>
|
|
|
<div class="text-muted" title="{{::item.orderItem.product.spec}}"
|
|
|
- ng-bind="::item.orderItem.product.spec"></div>
|
|
|
- <div class="text-bold text-inverse" ng-if="item.orderItem.factory">送货工厂：<span ng-bind="::item.orderItem.factory"></span></div>
|
|
|
- </td>
|
|
|
- <td class="text-left">
|
|
|
- <div class="text-num">
|
|
|
- <span ng-bind="::currency(send.currency)"></span>
|
|
|
- <span ng-bind="::item.price | number:6"></span>
|
|
|
- </div>
|
|
|
- <div class="text-muted">
|
|
|
- 税率：<span class="text-num" ng-bind="::item.orderItem.taxrate || 0"></span>%
|
|
|
- </div>
|
|
|
- <div class="text-muted">
|
|
|
- 付款条件：<span ng-bind="::item.orderItem.order.payments"></span>
|
|
|
- </div>
|
|
|
+ ng-bind="::item.orderItem.product.spec"></div>
|
|
|
+ <div class="text-bold text-inverse" ng-if="item.orderItem.factory">送货工厂：<span ng-bind="::item.orderItem.factory"></span></div>
|
|
|
</td>
|
|
|
<td class="text-center br-l">
|
|
|
<div>
|
|
|
@@ -311,7 +300,7 @@
|
|
|
<div><code ng-if="item.replyRemark"><i class="fa fa-fw fa-warning"></i><span ng-bind="::item.replyRemark"></span></code></div>
|
|
|
<div ng-if="item.verifyQty > 0" class="dropdown text-center">
|
|
|
<br>
|
|
|
- <span href="javascript:void(0);" class="dropdown-toggle text-default">客户已收料{{::item.verifyQty}}{{::item.orderItem.product.unit}}<i class="fa fa-fw fa-angle-down"></i></span>
|
|
|
+ <span href="javascript:void(0);" class="dropdown-toggle text-default">已收料{{::item.verifyQty}}{{::item.orderItem.product.unit}}<i class="fa fa-fw fa-angle-down"></i></span>
|
|
|
<div class="dropdown-menu pane" style="width: 300px;">
|
|
|
<div class="pane-body">
|
|
|
<ul class="list-unstyled list-menu">
|
|
|
@@ -342,6 +331,6 @@
|
|
|
</div>
|
|
|
</td>
|
|
|
</tr>
|
|
|
- </tbody>
|
|
|
-</table>
|
|
|
+ </tbody>
|
|
|
+ </table>
|
|
|
</div>
|
ouxianqin