新增采购变更页面相关

src/main/java/com/uas/platform/b2b/controller/PurcOrderChangeController.java

@@ -57,6 +57,8 @@ public class PurcOrderChangeController {
     public SPage<PurchaseOrderAll> findByPageInfo(PageParams pageParams, String searchFilter) {
         PageInfo pageInfo = new PageInfo(pageParams);
         SearchFilter filter =  JSONObject.parseObject(searchFilter, SearchFilter.class);
+        pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+//        pageInfo.filter("source", "B2B");
         return orderChangeService.findEnableToChange(pageInfo, filter);
     }
 
@@ -66,6 +68,7 @@ public class PurcOrderChangeController {
      * @param change 采购变更单
      * @return
      */
+    @RequestMapping(value = "/save", method = RequestMethod.POST)
     public ModelMap saveChange(@RequestBody PurchaseOrderChange change) {
         return orderChangeService.save(change);
     }

src/main/java/com/uas/platform/b2b/model/PurchaseOrderAll.java

@@ -278,6 +278,12 @@ public class PurchaseOrderAll {
 	@Column(name = "pu_auid")
     private Long auId;
 
+	/**
+	 * 订单来源
+	 */
+	@Column(name = "pu_source")
+	private String source;
+
 	public String getPurpose() {
 		return purpose;
 	}
@@ -613,4 +619,12 @@ public class PurchaseOrderAll {
     public void setAuId(Long auId) {
         this.auId = auId;
     }
+
+	public String getSource() {
+		return source;
+	}
+
+	public void setSource(String source) {
+		this.source = source;
+	}
 }

src/main/java/com/uas/platform/b2b/service/impl/PurcOrderChangeServiceImpl.java

@@ -1,7 +1,9 @@
 package com.uas.platform.b2b.service.impl;
 
 import com.uas.platform.b2b.dao.*;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.PurchaseOrderAll;
+import com.uas.platform.b2b.model.PurchaseOrderChange;
+import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.service.PurcOrderChangeService;
 import com.uas.platform.b2b.support.SPageUtils;
 import com.uas.platform.core.model.PageInfo;
@@ -18,10 +20,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.criteria.*;
-import java.util.Arrays;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 采购变更单
@@ -73,7 +76,7 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
         Page<PurchaseOrderAll> pageOrders = purchaseOrderAllDao.findAll(new Specification<PurchaseOrderAll>() {
             @Override
             public Predicate toPredicate(Root<PurchaseOrderAll> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
-                Predicate[] predicates = pageInfo.getPredicates(root, query, builder);
+               /* Predicate[] predicates = pageInfo.getPredicates(root, query, builder);
                 if (filter != null && filter.getKeyword() != null) {
                     predicates = Arrays.copyOf(predicates, predicates.length + 1);
                     SetJoin<PurchaseOrderAll, PurchaseOrderAllItem> join = root
@@ -83,7 +86,8 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
                     Predicate brand = builder.like(join.get("product").get("brand").as(String.class), filter.getKeyword());
                     predicates[predicates.length - 1] = brand;
                 }
-                return query.where(predicates).getRestriction();
+                return query.where(predicates).getRestriction();*/
+                return query.where(pageInfo.getPredicates(root, query, builder)).getRestriction();
             }
         }, pageInfo);
         return SPageUtils.covertSPage(pageOrders);
@@ -100,12 +104,12 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
         change.setBackStatus((short) Status.NOT_UPLOAD.value());
         change.setBackStatus((short) Status.NOT_UPLOAD.value());
         change.setReplySendStatus((short) Status.NOT_UPLOAD.value());
-        List<PurchaseOrderChangeItem> itemList = changeItemDao.save(change.getOrderChangeItems());
+       /* List<PurchaseOrderChangeItem> itemList = changeItemDao.save(change.getOrderChangeItems());
         if (change.getUnNeedReply() == 1) {// 不需要供应商确认，更新原单据
             PurchaseOrderInfo orderInfo = orderInfoDao.findOne(change.getOrderId());
             //TODO 采购单主表信息变更
             // TODO 采购单明细变更
-        }
+        }*/
         return null;
     }
 

src/main/webapp/resources/js/index/app.js

@@ -3440,7 +3440,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.$dateOpen = !openParam;
         };
 
-
         // 取消
         $scope.cancel = function () {
             $modalInstance.dismiss();
@@ -23987,41 +23986,70 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
      * @author hejq
      * @date 2018-06-25 16:38
      */
-    app.controller('PurcChangeNewCtrl', ['$scope', 'toaster', 'BaseService', 'AuthenticationService', '$modal',
-        function ($scope, toaster, BaseService, AuthenticationService, $modal) {
+    app.controller('PurcChangeNewCtrl', ['$scope', 'toaster', 'BaseService', 'AuthenticationService', '$modal', '$filter', 'change',
+        function ($scope, toaster, BaseService, AuthenticationService, $modal, $filter, change) {
         // 获取登录人员信息
         AuthenticationService.getAuthentication().success(function (data) {
             $scope.user = data;
+            initChange();
+        });
+
+        // 初始化变更单信息
+        var initChange = function () {
             $scope.change = {
                 date: new Date(),
-                recorder: $scope.user.userName
+                recorder: $scope.user.userName,
+                orderCode: null,
+                code: 'B2BPC' + $filter('date')(new Date(), 'yyMMddHHmmss_sss'),
+                orderId: null,
+                orderChangeItems: []
             }
-        });
-
+        }
         $scope.getEnableOrders = function() {
+            initChange();
             var modalInstance = $modal.open({
                 animation: true,
-                templateUrl: 'static/tpl/index/search/enterpirseInfo.html',
+                size: 'lg',
+                templateUrl: 'static/tpl/index/purc/modal/enableOrderList.html',
                 controller: 'EnableChangeListCtrl',
                 resolve: {
-                    enname: function () {
-                        return name
-                    }
                 }
             });
             modalInstance.result.then(function (data) {
-                InvitationRecord.invite({formStore: data}, {}, function (data) {
-                    if (data.success) {
-                        toaster.pop('success', '提示', data.success);
-                    }
-                    if (data.error) {
-                        toaster.pop('error', '提示', data.error);
-                    }
-                }, function (response) {
-                    toaster.pop('error', '提示', response.data);
+                $scope.change.orderCode = data.code;
+                $scope.change.orderId = data.id;
+                $scope.orderItems = data.orderItems;
+                $scope.change.oldCurrency = data.currency;
+                $scope.change.oldPayments = data.payments;
+                $scope.change.oldRate = data.rate;
+                angular.forEach($scope.orderItems, function (item) {
+                    $scope.change.orderChangeItems.push({
+                        oldProductId: item.productId,
+                        orderItemId: item.id,
+                        orderItemNumber: item.number,
+                        oldQty: item.qty,
+                        oldPrice: item.price,
+                        oldTaxrate: item.taxrate,
+                        oldDelivery: item.delivery,
+                        oldProduct: item.product
+                    });
                 });
             });
         }
+
+        $scope.openDatePicker = function ($event, openParam) {
+            $event.preventDefault();
+            $event.stopPropagation();
+            $scope.$dateOpen = !openParam;
+        };
+
+        $scope.save = function() {
+            change.save({}, $scope.change, function (data) {
+
+            }, function(res) {
+
+            });
+        }
     }]);
 
     /**
@@ -24033,6 +24061,18 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     app.controller('EnableChangeListCtrl', ['$scope', 'change', 'BaseService', 'ngTableParams', 'toaster', '$modalInstance',
         function ($scope, change, BaseService, ngTableParams, toaster, $modalInstance) {
 
+            $scope.dateZoneText = '一个月内';
+            $scope.condition = {dateZone: 1};
+
+            /* 时间筛选初始化*/
+            var fromDate = new Date();
+            var toDate = new Date();
+            fromDate.setMonth(fromDate.getMonth() - 1);
+            fromDate.setHours(0, 0, 0, 0);
+            toDate.setHours(23, 59, 59, 999);
+            $scope.condition.dateFrom = fromDate;
+            $scope.condition.dateTo = toDate;
+
             $scope.tableParams = new ngTableParams({
                 page: 1,
                 count: 5,
@@ -24045,7 +24085,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 getData: function ($defer, params) {
                     $scope.loading = true;
                     var pageParams = params.url();
-                    var realActive = {};
                     pageParams.searchFilter = { // 筛选条件
                         keyword: $scope.keyword,
                         fromDate: getDateTime($scope.condition.dateFrom),
@@ -24054,7 +24093,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     change.getEnableOrderList.call(null, BaseService.parseParams(pageParams), function (page) {
                         $scope.loading = false;
                         if (page) {
-                            params.total(page.totalElements);
+                            params.total(page.totalElement);
                             $defer.resolve(page.content);
                         }
                     }, function (response) {
@@ -24064,73 +24103,34 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 }
             });
 
-            $scope.close = function () {
-                $modalInstance.close();
-                window.location.reload();
-            };
-
-
-            $scope.checks = {
-                checked: false
-            };// 全选框
-
-            $scope.checkAll = function () {
-                angular.forEach($scope.tableParams.data, function (message) {
-                    message.checked = $scope.checks.checked;
-                });
-            };
-
+           $scope.checkedOrder = null;
+            var checkItems = [];
             // 单选
-            $scope.checkOne = function (vendor) {
-                vendor.checked = true;
-
-                var checked = true;
-                angular.forEach($scope.tableParams.data, function (message) { // 单选全部时，全选选中
-                    if (!message.checked) {
-                        checked = false;
-                    }
-                });
-                $scope.checks.checked = checked;
-            };
-
-            // 单反选
-            $scope.unCheckOne = function (vendor) {
-                vendor.checked = false;
-                $scope.checks.checked = false;
-            };
-
-            /**
-             * 当前页标为已读
-             */
-            $scope.setRead = function () {
-                $scope.loading = true;
-                var messageIds = [];
-                angular.forEach($scope.tableParams.data, function(message) {
-                    messageIds.push(message.id);
-                });
-                PagingRelease.setPageRead({}, messageIds, function (data) {
-                    $scope.loading = false;
-                    if (data.success) {
-                        toaster.pop("success", "设置已读成功");
-                    }
-                    if (data.error) {
-                        toaster.pop("error", "设置已读失败");
-                    }
-                    $scope.tableParams.page(1);
-                    $scope.tableParams.reload();
-                });
+            $scope.checkOne = function (order) {
+                order.checked = !order.checked;
+                if (order.checked) {
+                    $scope.checkedOrder = order;
+                } else {
+                    $scope.checkedOrder = null;
+                    angular.forEach(order.orderItems, function (item) {
+                        item.checked = false;
+                    });
+                    checkItems = [];
+                }
             };
 
-            // 点击内容连接之后，信息标为已读
-            $scope.setOneRead = function (id) {
-                $scope.loading = true;
-                $modalInstance.close();
-                PagingRelease.setMessageRead({id: id}, {}, function (data) {
-                    $scope.loading = false;
-                }, function (response) {
-                    $scope.loading = false;
-                    toaster.pop('error', '提示', response.data);
-                });
+            // 明细
+            $scope.checkItem = function (item) {
+                item.checked = !item.checked;
+                if (item.checked) {
+                    checkItems.push(item);
+                } else {
+                    angular.forEach(checkItems, function (checkItem) {
+                       if (checkItem.id == item.id) {
+                           checkItems.splice(item, 1);
+                       }
+                    });
+                }
             };
 
             // 搜索框回车
@@ -24139,6 +24139,28 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 $scope.tableParams.reload();
             };
 
+            $scope.getCartTotal = function (items) {
+                var sum = 0;
+                angular.forEach(items, function (item) {
+                    sum += item.qty * item.price;
+                });
+                return sum;
+            };
+
+            // 选择
+            $scope.choose = function () {
+                if ($scope.checkedOrder == null || checkItems.length == 0) {
+                    toaster.pop('error', '请先选择采购单信息');
+                } else {
+                    $scope.checkedOrder.orderItems = checkItems;
+                    $modalInstance.close($scope.checkedOrder);
+                }
+            }
+
+            // 关闭
+            $scope.close = function () {
+                $modalInstance.dismiss();
+            };
         }]);
 
     return app;

src/main/webapp/resources/js/index/services/PurcChange.js

@@ -39,6 +39,14 @@ define([ 'ngResource'], function() {
             },
             getEnableOrderList: {
                 url: 'purc/change/enable/orderList'
+            },
+            save: {
+                method: 'POST',
+                url: 'purc/change/save',
+                isArray: false,
+                headers: {
+                    'Content-Type' : 'application/json;charset=UTF-8'
+                }
             }
         })
     }])

src/main/webapp/resources/tpl/index/purc/change_new.html

@@ -59,12 +59,13 @@
     position: absolute;
     background: #bfbfbf;
     border: 1px solid #bfbfbf;
+    margin-left: 75px;
 }
 .purchase_form01 ul li .input-group .input-group-btn .btn-sm:focus{
     background: #5078cb;
 }
 .purchase_form01 ul li .input-group .form-control {
-    width:146px;
+    width:200px;
     background: #fff;
     border: #bfbfbf 1px solid;
 	}
@@ -153,7 +154,7 @@
                                 <em>采购单号：</em>
                                 <div class="input-group">
                                     <span class="input-group-btn">
-                                        <button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
+                                        <button class="btn btn-sm" type="button" ng-click="getEnableOrders()"><i class="fa fa-search"></i></button>
                                     </span>
                                     <input type="text" ng-model="change.orderCode" class="form-control" readonly>
                                 </div>
@@ -169,41 +170,98 @@
                                 <span class="has_time" ng-bind="change.date| date: 'yyyy-MM-dd'"></span>
                             </div>
                         </li>
+                        <li>
+                            <div class="fr">
+                                <em>原付款方式：</em>
+                                <span ng-bind="change.oldPayments || '无'"></span>
+                            </div>
+                            <div class="fr">
+                                <em>新付款方式：</em>
+                                <span><input type="text" class="input01" ng-model="change.newPayments"></span>
+                            </div>
+                        </li>
+                        <li>
+                            <div class="fr">
+                                <em>原付款币种：</em>
+                                <span ng-bind="change.oldCurrency || '无'"></span>
+                            </div>
+                            <div class="fr">
+                                <em>新付款币种：</em>
+                                <span><input type="text" class="input01" ng-model="change.newCurrency"></span>
+                            </div>
+                        </li>
+                        <li>
+                            <div class="fr">
+                                <em>原付款汇率：</em>
+                                <span ng-bind="change.oldRate || '无'"></span>
+                            </div>
+                            <div class="fr">
+                                <em>新付款汇率：</em>
+                                <span><input type="text" class="input01" ng-model="change.newRate"></span>
+                            </div>
+                        </li>
+                        <li>
+                            <div class="fr">
+                                <em>备注：</em>
+                                <span><input type="text" class="input01" ng-model="change.remark"></span>
+                            </div>
+                            <div class="fr">
+                                <em>是否需要供应商确认：</em>
+                                <select name="" class="select" ng-model="change.unNeedReply" ng-required="true">
+                                    <option value="1">是</option>
+                                    <option value="0">否</option>
+                                </select>
+                            </div>
+                        </li>
                     </ul>
                 </div>
-                <div class="purchase_xq clearfix">
+                <div class="com_title01"><span>变更明细</span></div>
+                <div class="purchase_xq clearfix" scroll-table>
                     <dl>
                         <dt>
                             <span class="wid01">序号</span>
                             <span class="wid02">产品名称</span>
                             <span>型号</span>
-                            <span>产品规格</span>
                             <span>品牌</span>
-                            <span>数量</span>
-                            <span>单价</span>
-                            <span>订单单价</span>
-                            <span>采购总额</span>
-                            <span>备注</span>
-                            <span>操作</span>
+                            <span>品牌</span>
+                            <span>原数量</span>
+                            <span>新数量</span>
+                            <span>原单价</span>
+                            <span>新单价</span>
+                            <span>原税率</span>
+                            <span>新税率</span>
+                            <span>原交货日期</span>
+                            <span>新交货日期</span>
                         </dt>
-                       <!-- <dd ng-repeat="">
+                        <dd ng-repeat="item in change.orderChangeItems">
                             <span class="wid01">{{$index+1}}</span>
-                            <span class="wid02"><input type="text" class="text-center" ng-model="item.prodname" ng-required="true"></span>
-                            <span><input type="text" class="text-center" ng-model="item.prodcode" ng-required="true"></span>
-                            <span><input type="text" class="text-center" ng-model="item.prodspec" ng-required="true"></span>
-                            <span><input type="text" class="text-center" ng-model="item.prodbrand" ng-required="true"></span>
-                            <span><input type="text" class="text-center" ng-model="item.amount" ng-required="true" ng-change="totalPrice()"></span>
-                            <span><input type="text" class="text-center" ng-model="item.unitprice" ng-required="true" ng-change="totalPrice()"></span>
-                            <span><input type="text" class="text-center" ng-model="item.purcprice" ng-required="true" ng-change="totalPrice()"></span>
-                            <span>{{item.unitprice * item.amount | number: 2}}</span>
-                            <span><input type="text" class="text-center" ng-model="item.remark"></span>
+                            <span class="wid02" ng-bind="item.oldProduct.title"></span>
+                            <span ng-bind="item.oldProduct.cmpCode"></span>
+                            <span ng-bind="item.oldProduct.brand"></span>
+                            <span ng-bind="item.oldQty"></span>
+                            <span><input type="text" class="text-center" ng-model="item.newQty"></span>
+                            <span ng-bind="item.oldPrice"></span>
+                            <span><input type="text" class="text-center" ng-model="item.newPrice"></span>
+                            <span ng-bind="item.oldTaxrate"></span>
+                            <span><input type="text" class="text-center" ng-model="item.newTaxrate"></span>
+                            <span ng-bind="item.oldDelivery | date: 'yyyy-MM-dd'"></span>
+                            <span>
+                                <div class="input-group">
+                                    <input ng-model="item.newDelivery" type="text" class="form-control"
+                                           placeholder="点击选择时间" datepicker-popup="yyyy-MM-dd" is-open="$dateOpen"
+                                           min-date="getMinDate()" ng-required="true"
+                                           current-text="今天" clear-text="清除" close-text="关闭"
+                                           datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                           ng-focus="openDatePicker($event, $dateOpen)" readonly>
+                                </div>
+                            </span>
                             <span><a ng-click="add($index)" style="color: #1f4fb2">添加</a><a ng-click="del($index)" style="color: #d32526"> 删除</a></span>
-                        </dd>-->
+                        </dd>
                     </dl>
                 </div>
                 <div class="save">
-                	<button ng-click="save('保存')">保存</button>
-                	<button ng-click="save('已提交')">提交</button>
+                	<!--<button ng-click="save('保存')">保存</button>-->
+                	<button ng-click="save()">提交</button>
                 </div>
             </div>
         </form>

src/main/webapp/resources/tpl/index/purc/modal/enableOrderList.html

@@ -0,0 +1,284 @@
+<style>
+
+.condition .more .form-group {
+	margin-bottom: 0;
+}
+
+.order-table .header>th {
+	height: 38px;
+	text-align: center;
+	background: #f5f5f5;
+	border-top: 1px solid #e8e8e8;
+	border-bottom: 1px solid #e8e8e8;
+}
+
+.toolbar label {
+	margin-right: 10px;
+	margin-bottom: 0;
+}
+
+.order-table .order-hd {
+	background: #f5f5f5;
+	height: 40px;
+	line-height: 40px;
+}
+
+.order-table .order-hd td.first {
+	padding-left: 20px;
+}
+
+.order-table .order-hd .order-main span {
+	margin-right: 8px;
+}
+
+.order-table .order-hd .order-sum {
+	padding: 0 5px;
+}
+.order-table>tbody:hover{
+	border: #3f84f6 2px solid !important;
+}
+
+.order-table .operates i {
+	padding: 0 2px;
+}
+
+.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 .product {
+	padding-left: 20px;
+}
+
+.order-table .order-bd .order-number {
+	position: absolute;
+	top: -1px;
+	left: -1px;
+	width: 20px;
+	height: 20px;
+	line-height: 20px;
+	text-align: center;
+	background: #f5f5f5;
+	font-weight: 500;
+	border: solid 1px #d5d5d5;
+	border-radius: 0 0 10px 0;
+}
+
+.buy-cart a{
+	color: #5078cb;
+	float: left;
+	margin-left: 15px;
+}
+.buy-cart a img{
+	margin-right: 3px;
+}
+.modal-body {
+    max-height: 350px;
+    overflow: auto;
+}
+</style>
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
+    <div class="loading in" ng-class="{'in': loading}"></div>
+    <div class="pub-com_head">
+        <span>采购订单</span>
+        <div class="p-right">
+            <a ng-click="close()" type="button">X</a>
+        </div>
+    </div>
+    <div class="condition block">
+        <div class="search-bg condition block" style="padding: 10px 15px;">
+            <div class="row">
+                <div id="topSearch" style="float: left">
+                    <a ng-click="changeDateZone(1);condition.$open=false" title="最近一个月"
+                       ng-class="{'active':condition.dateZone=='1'}">最近一个月</a>
+                    <a ng-click="changeDateZone(3);condition.$open=false" title="最近三个月"
+                       ng-class="{'active':condition.dateZone=='3'}">最近三个月</a>
+                    <a ng-click="changeDateZone(6);condition.$open=false" title="最近六个月"
+                       ng-class="{'active':condition.dateZone=='6'}">最近六个月</a>
+                    <a ng-click="condition.$open=!condition.$open;changeDateZone(-1)" title="自定义"
+                       ng-class="{'active':condition.dateZone=='-1'}">自定义</a>
+                </div>
+                <div class="col-xs-6" style="float: right;">
+                    <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(keyword)" placeholder="输入单据编号、客户名称、物料名称搜索" style="width: 100%"/>
+                            <a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="more-list 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">
+                            <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" max-date="condition.dateTo"
+                                   current-text="今天" clear-text="清除" close-text="关闭"
+                                   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
+                            <span class="input-group-btn">
+						<button type="button" class="btn btn-default"
+                                ng-click="openFilterDatePicker($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" min-date="condition.dateFrom"
+                                   current-text="今天" clear-text="清除" close-text="关闭"
+                                   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
+                            <span class="input-group-btn">
+						<button type="button" class="btn btn-default"
+                                ng-click="openFilterDatePicker($event, condition, '$toOpened')">
+							<i class="fa fa-calendar"></i>
+						</button>
+					</span>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+    <div class="modal-body">
+        <table class="order-table block" ng-table="tableParams">
+            <thead>
+                <tr class="header">
+                    <th>选择</th>
+                    <th>物料</th>
+                    <th width="80">含税单价</th>
+                    <th width="100">税率</th>
+                    <th width="100">数量</th>
+                    <th width="120">交货日期</th>
+                </tr>
+            </thead>
+            <tbody ng-if="tableParams.total() == 0">
+            <tr>
+                <td colspan="7">
+                    <div id="empty">
+                        <div class="left_img">
+                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img
+                                    src="static/img/empty/uas_empty.png"></a>
+                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                        </div>
+                        <div class="right_link">
+                            <p>当前没有对应的采购订单！</p>
+                        </div>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="7">
+                    <div id="empty_info">
+                        <div class="f16 text-center empty_title">
+                            <p>为什么我没有采购订单？</p>
+                        </div>
+                        <div class="f14 empty_explain">
+                            <div class="info">
+                                <p>1、您的采购单在ERP系统上还没审核，订单无法上传到平台<br>
+                                    解决：采购员沟通确认单据是否已经审核（只有ERP中已经审核的单据才能接收到）</p>
+                            </div>
+                            <div class="info">
+                                <p>2、ERP中供应商信息有误<br>
+                                    解决：与您的供应商沟通确认他的资料在供应商资料中是否维护正确，尤其是企业UU号</p>
+                            </div>
+                            <div class="info">
+                                <p>3、您的供应商正在使用旧版本的UAS商务平台<br>
+                                    解决：我们仍有部分用户在使用旧版本UAS商务平台系统，你可以用您的企业UU号和管理员个人UU号
+                                    <a href="http://www.usoftchina.com" class="text-bold text-link"
+                                       title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a>
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </td>
+            </tr>
+            </tbody>
+            <tbody ng-repeat="order in $data track by order.id" class="item-body">
+            <tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed"
+                ng-class="{'text-bold': order.display>0}">
+                <td class="text-center">
+                    <input type="checkbox" ng-click="checkOne(order)" ng-checked="order.checked"
+                           ng-disabled="checkedOrder != null && checkedOrder.id != order.id">
+                </td>
+                <td class="first" colspan="5">
+                    <div class="order-main">
+					<span class="text-num text-bold"
+                          ng-bind="::order.date | date:'yyyy-MM-dd'"></span>
+                        <span>订单号：<a
+                                class="text-num" ng-bind="::order.code" target="_self"></a></span>
+                        <span ng-bind="::order.receiveName"></span>
+                    </div>
+                </td>
+                <td class="order-sum">{{::order.currency}}： <span
+                        ng-bind="getCartTotal(order.orderItems) | number : 2"
+                        class="text-num text-bold"></span>
+                </td>
+            </tr>
+            <tr class="order-bd" ng-repeat="item in order.orderItems track by item.id" ng-if="!order.$collapsed ">
+                <td><input type="checkbox" ng-click="checkItem(item)" ng-checked="item.checked"
+                           ng-disabled="checkedOrder == null || (checkedOrder != null && checkedOrder.id != order.id)">
+                </td>
+                <td class="product">
+                    <div class="text-num order-number" ng-class="{'key': item.key&&order.$showAll}"
+                         title="第{{::item.number}}行">{{::item.number}}
+                    </div>
+                    <div class="text-num text-bold">
+                        <span ng-bind="::item.product.code"></span>
+                    </div>
+                    <div>
+                        <span ng-bind="::item.product.title"></span>
+                    </div>
+                    <div class="text-muted"
+                         ng-bind="::item.product.spec"></div>
+                    <div class="text-muted text-bold" ng-if="item.vendspec"><span ng-bind="::item.vendspec"></span>
+                    </div>
+                    <div class="text-bold text-inverse" ng-if="item.factory">送货工厂：<span ng-bind="::item.factory"></span>
+                    </div>
+                    <div class="text-bold text-inverse" ng-if="item.remark">备注：<span ng-bind="::item.remark"></span>
+                    </div>
+                </td>
+                <td class="text-center">
+                    <div class="text-num" ng-bind="::item.price | number:6"></div>
+                </td>
+                <td class="text-center">
+                    <div class="text-muted">{{::item.taxrate || 0}}</div>
+                </td>
+                <td class="text-center">
+                    <div class="text-num" ng-bind="::item.qty"></div>
+                    <div class="text-muted" ng-bind="::item.product.unit"></div>
+                </td>
+                <td class="text-center br-l">
+                    <div class="text-num" ng-bind="::item.delivery | date:'yyyy-MM-dd'"></div>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="modal-footer">
+        <a class="btn btn-success btn-sm" ng-click="choose()">确定</a>
+        <a class="btn btn-waring btn-sm" ng-click="close()"> 取消</a>
+    </div>
+</div>