求购模块-买家中心-商城现货，报价列表

src/main/java/com/uas/platform/b2c/trade/seek/controller/SeekPurchaseOfferController.java

@@ -3,8 +3,9 @@ package com.uas.platform.b2c.trade.seek.controller;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
-import com.uas.platform.b2c.trade.seek.model.SeekPurchasePushGoods;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOffer;
+import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOfferGoods;
+import com.uas.platform.b2c.trade.seek.model.SeekPurchasePushGoods;
 import com.uas.platform.b2c.trade.seek.service.SeekPurchaseOfferService;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.PageInfo;
@@ -76,7 +77,7 @@ public class SeekPurchaseOfferController {
         User user = (User) session.getAttribute("user");
         logger.log("求购", "获取买家求购报价列表，求购id为" + spId);
         PageInfo info = new PageInfo(params);
-        return seekPurchaseOfferService.getSeekPurchaseOfferPageInfo(info, spId, user.getUserUU());
+        return seekPurchaseOfferService.getSeekPurchaseOfferPageInfo(info, spId, user);
     }
 
     /**
@@ -90,4 +91,11 @@ public class SeekPurchaseOfferController {
         PageInfo info = new PageInfo(params);
         return seekPurchaseOfferService.getSeekPushGoodsPageInfo(info, user, minReleaseDate, maxReleaseDate, keyWord, deadline);
     }
+
+    @RequestMapping(value = "/getMyOfferPageInfo", method = RequestMethod.GET)
+    public Page<SeekPurchaseOfferGoods> getMyOfferPageInfo(PageParams params, String minReleaseDate, String maxReleaseDate, String keyWord, String deadline) {
+        User user = SystemSession.getUser();
+        PageInfo info = new PageInfo(params);
+        return seekPurchaseOfferService.getMyOfferPageInfo(info, user, minReleaseDate, maxReleaseDate, keyWord, deadline);
+    }
 }

src/main/java/com/uas/platform/b2c/trade/seek/dao/SeekPurchaseOfferGoodsDao.java

@@ -0,0 +1,18 @@
+package com.uas.platform.b2c.trade.seek.dao;
+
+import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOfferGoods;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+/**
+ *
+ * @author liusw
+ * @version 2017/12/12 16:48
+ */
+@Repository
+public interface SeekPurchaseOfferGoodsDao extends JpaSpecificationExecutor<SeekPurchaseOfferGoods>,
+        JpaRepository<SeekPurchaseOfferGoods, Long> {
+
+}
+

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchase.java

@@ -40,7 +40,7 @@ public class SeekPurchase {
     private Long uu;
 
     /**
-     * 求购详细信息
+     * 用户详细信息
      */
     @OneToOne(cascade = { CascadeType.REFRESH })
     @JoinColumn(name = "sp_uu", insertable = false, updatable = false)

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchaseOffer.java

@@ -1,11 +1,17 @@
 package com.uas.platform.b2c.trade.seek.model;
 
+import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.User;
 import java.util.Date;
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * 卖家报价实体类
@@ -69,11 +75,26 @@ public class SeekPurchaseOffer {
     @Column(name = "of_enuu")
     private Long enUu;
 
+    /**
+     * 企业的详细信息
+     */
+    @OneToOne(cascade = { CascadeType.REFRESH })
+    @JoinColumn(name = "of_enuu", insertable = false, updatable = false)
+    private Enterprise enterprise;
+
     /**
      * 卖家uu号
      */
     @Column(name = "of_uu")
     private Long uu;
+
+    /**
+     * 用户详细信息
+     */
+    @OneToOne(cascade = { CascadeType.REFRESH })
+    @JoinColumn(name = "of_uu", insertable = false, updatable = false)
+    private User user;
+
     /**
      * 报价状态
      */
@@ -86,6 +107,18 @@ public class SeekPurchaseOffer {
     @Column(name = "of_offerTime")
     private Date offerTime;
 
+    /**
+     * 名称
+     */
+    @Transient
+    private String userName;
+
+    /**
+     * 手机号
+     */
+    @Transient
+    private String userTel;
+
     public Long getId() {
         return id;
     }
@@ -173,4 +206,34 @@ public class SeekPurchaseOffer {
     public void setOfferTime(Date offerTime) {
         this.offerTime = offerTime;
     }
+
+    public Enterprise getEnterprise() {
+        return enterprise;
+    }
+
+    public void setEnterprise(Enterprise enterprise) {
+        this.enterprise = enterprise;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public String getUserName() {
+        if (enterprise != null) {
+            userName = enterprise.getEnName();
+        }
+        return userName;
+    }
+
+    public String getUserTel() {
+        if (user != null) {
+            userTel = user.getUserTel();
+        }
+        return userTel;
+    }
 }

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchaseOfferGoods.java

@@ -0,0 +1,253 @@
+package com.uas.platform.b2c.trade.seek.model;
+
+import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.User;
+import java.util.Date;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * 卖家报价与库存的视图
+ *
+ * @author liusw
+ * @version 2017/12/20 15:13
+ */
+@Entity
+@Table(name = "v$seek$seekpurchaseoffergoods")
+public class SeekPurchaseOfferGoods {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @Id
+    @GeneratedValue
+    @Column(name = "of_id")
+    private Long id;
+
+    /**
+     * 求购id
+     */
+    @Column(name = "sp_id")
+    private Long spId;
+
+    /**
+     * 报价单价
+     */
+    @Column(name = "of_unitPrice")
+    private Double unitPrice;
+
+    /**
+     * 报价币别
+     */
+    @Column(name = "of_currency")
+    private String currency;
+
+    /**
+     * 最小天数
+     */
+    @Column(name = "of_minDay")
+    private Integer minDay;
+
+    /**
+     * 最大天数
+     */
+    @Column(name = "of_maxDay")
+    private Integer maxDay;
+
+    /**
+     * 生产日期
+     */
+    @Column(name = "of_produceDate")
+    private Date produceDate;
+
+    /**
+     * 卖家企业uu号
+     */
+    @Column(name = "of_enuu")
+    private Long enUu;
+
+    /**
+     * 企业的详细信息
+     */
+    @OneToOne(cascade = { CascadeType.REFRESH })
+    @JoinColumn(name = "of_enuu", insertable = false, updatable = false)
+    private Enterprise enterprise;
+
+    /**
+     * 卖家uu号
+     */
+    @Column(name = "of_uu")
+    private Long uu;
+
+    /**
+     * 用户详细信息
+     */
+    @OneToOne(cascade = { CascadeType.REFRESH })
+    @JoinColumn(name = "of_uu", insertable = false, updatable = false)
+    private User user;
+
+    /**
+     * 报价状态
+     */
+    @Column(name = "of_status")
+    private Integer status;
+
+    /**
+     * 报价时间
+     */
+    @Column(name = "of_offerTime")
+    private Date offerTime;
+
+    /**
+     * 名称
+     */
+    @Transient
+    private String userName;
+
+    /**
+     * 手机号
+     */
+    @Transient
+    private String userTel;
+
+    /**
+     * 企业uu号
+     */
+    @Column(name = "go_enuu")
+    private Long goodsEnuu;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getSpId() {
+        return spId;
+    }
+
+    public void setSpId(Long spId) {
+        this.spId = spId;
+    }
+
+    public Double getUnitPrice() {
+        return unitPrice;
+    }
+
+    public void setUnitPrice(Double unitPrice) {
+        this.unitPrice = unitPrice;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public Integer getMinDay() {
+        return minDay;
+    }
+
+    public void setMinDay(Integer minDay) {
+        this.minDay = minDay;
+    }
+
+    public Integer getMaxDay() {
+        return maxDay;
+    }
+
+    public void setMaxDay(Integer maxDay) {
+        this.maxDay = maxDay;
+    }
+
+    public Date getProduceDate() {
+        return produceDate;
+    }
+
+    public void setProduceDate(Date produceDate) {
+        this.produceDate = produceDate;
+    }
+
+    public Long getEnUu() {
+        return enUu;
+    }
+
+    public void setEnUu(Long enUu) {
+        this.enUu = enUu;
+    }
+
+    public Long getUu() {
+        return uu;
+    }
+
+    public void setUu(Long uu) {
+        this.uu = uu;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Date getOfferTime() {
+        return offerTime;
+    }
+
+    public void setOfferTime(Date offerTime) {
+        this.offerTime = offerTime;
+    }
+
+    public Enterprise getEnterprise() {
+        return enterprise;
+    }
+
+    public void setEnterprise(Enterprise enterprise) {
+        this.enterprise = enterprise;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public String getUserName() {
+        if (enterprise != null) {
+            userName = enterprise.getEnName();
+        }
+        return userName;
+    }
+
+    public String getUserTel() {
+        if (user != null) {
+            userTel = user.getUserTel();
+        }
+        return userTel;
+    }
+
+    public Long getGoodsEnuu() {
+        return goodsEnuu;
+    }
+
+    public void setGoodsEnuu(Long goodsEnuu) {
+        this.goodsEnuu = goodsEnuu;
+    }
+}

src/main/java/com/uas/platform/b2c/trade/seek/service/SeekPurchaseOfferService.java

@@ -1,8 +1,9 @@
 package com.uas.platform.b2c.trade.seek.service;
 
 import com.uas.platform.b2c.common.account.model.User;
-import com.uas.platform.b2c.trade.seek.model.SeekPurchasePushGoods;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOffer;
+import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOfferGoods;
+import com.uas.platform.b2c.trade.seek.model.SeekPurchasePushGoods;
 import com.uas.platform.core.model.PageInfo;
 import java.util.Map;
 import org.springframework.data.domain.Page;
@@ -48,6 +49,16 @@ public interface SeekPurchaseOfferService {
      * @param spId
      * @return
      */
-    Page<SeekPurchaseOffer> getSeekPurchaseOfferPageInfo(PageInfo info, Long spId, Long uu);
+    Page<SeekPurchaseOffer> getSeekPurchaseOfferPageInfo(PageInfo info, Long spId, User user);
 
+    /**
+     * 我的报价
+     * @param pageInfo
+     * @param minReleaseDate
+     * @param maxReleaseDate
+     * @param keyWord
+     * @param deadline
+     * @return
+     */
+    Page<SeekPurchaseOfferGoods> getMyOfferPageInfo(PageInfo pageInfo, User user, String minReleaseDate, String maxReleaseDate, String keyWord, String deadline);
 }

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseOfferServiceImpl.java

@@ -3,9 +3,11 @@ package com.uas.platform.b2c.trade.seek.service.impl;
 import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
 import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseDao;
+import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseOfferGoodsDao;
 import com.uas.platform.b2c.trade.seek.dao.SeekPurchasePushGoodsDao;
 import com.uas.platform.b2c.trade.seek.dao.SeekPurchaseOfferDao;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchase;
+import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOfferGoods;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchasePushGoods;
 import com.uas.platform.b2c.trade.seek.model.SeekPurchaseOffer;
 import com.uas.platform.b2c.trade.seek.service.SeekPurchaseOfferService;
@@ -52,6 +54,9 @@ public class SeekPurchaseOfferServiceImpl implements SeekPurchaseOfferService {
     @Autowired
     private SeekPurchasePushGoodsDao seekPurchasePushGoodsDao;
 
+    @Autowired
+    private SeekPurchaseOfferGoodsDao seekPurchaseOfferGoodsDao;
+
     @Override
     public SeekPurchaseOffer saveOffer(SeekPurchaseOffer seekPurchaseOffer, User user) {
         if (user.getEnterprise() == null || !user.getEnterprise().isMallVendor()) {
@@ -157,14 +162,10 @@ public class SeekPurchaseOfferServiceImpl implements SeekPurchaseOfferService {
     }
 
     @Override
-    public Page<SeekPurchaseOffer> getSeekPurchaseOfferPageInfo(final PageInfo pageInfo, Long spId, Long uu) {
-        if (uu == null) {
-            throw new IllegalOperatorException("请求参数有误...");
-        }
+    public Page<SeekPurchaseOffer> getSeekPurchaseOfferPageInfo(final PageInfo pageInfo, Long spId, User user) {
         if (spId != null) {
             pageInfo.filter("spId", spId);
         }
-        pageInfo.filter("uu", uu);
         pageInfo.sorting("offerTime", Direction.DESC);
         Page<SeekPurchaseOffer> pages = seekPurchaseOfferDao
                 .findAll(new Specification<SeekPurchaseOffer>() {
@@ -176,4 +177,51 @@ public class SeekPurchaseOfferServiceImpl implements SeekPurchaseOfferService {
                 }, pageInfo);
         return pages;
     }
+
+    @Override
+    public Page<SeekPurchaseOfferGoods> getMyOfferPageInfo(final PageInfo pageInfo, User user,
+            String minReleaseDate, String maxReleaseDate, String keyWord, String deadline) {
+        // 发布时间
+        if (!StringUtils.isEmpty(minReleaseDate)) {
+            pageInfo.expression(PredicateUtils.gte("releaseDate", new Date(Long.valueOf(minReleaseDate)), false));
+        }
+        if (!StringUtils.isEmpty(maxReleaseDate)) {
+            pageInfo.expression(PredicateUtils.lte("releaseDate", new Date(Long.valueOf(maxReleaseDate)), false));
+        }
+        // 关键字
+        if (!StringUtils.isEmpty(keyWord)) {
+            SimpleExpression code = new SimpleExpression("code", keyWord, Operator.LIKE);
+            SimpleExpression brand = new SimpleExpression("brand", keyWord, Operator.LIKE);
+            SimpleExpression[] simpleExpressions = new SimpleExpression[]{code, brand};
+            LogicalExpression logicalExpression = PredicateUtils.or(simpleExpressions);
+            pageInfo.expression(logicalExpression);
+        }
+        // 截止时间查询
+        if (!StringUtils.isEmpty(deadline)) {
+            switch (deadline) {
+                case "全部":
+                    break;
+                case "已截止":
+                    pageInfo.expression(PredicateUtils.lte("deadline", new Date(), false));
+                    break;
+                default:
+                    pageInfo.expression(PredicateUtils.gt("deadline", new Date(), false));
+                    break;
+            }
+        } else {
+            pageInfo.expression(PredicateUtils.gt("deadline", new Date(), false));
+        }
+        // 按发布时间降序排序
+        pageInfo.sorting("releaseDate", Direction.DESC);
+        pageInfo.filter("uu", user.getEnterprise().getUu());
+        Page<SeekPurchaseOfferGoods> pages = seekPurchaseOfferGoodsDao
+                .findAll(new Specification<SeekPurchaseOfferGoods>() {
+                    public Predicate toPredicate(Root<SeekPurchaseOfferGoods> root, CriteriaQuery<?> query,
+                            CriteriaBuilder builder) {
+                        query.where(pageInfo.getPredicates(root, query, builder));
+                        return null;
+                    }
+                }, pageInfo);
+        return pages;
+    }
 }

src/main/java/com/uas/platform/b2c/trade/seek/service/impl/SeekPurchaseServiceImpl.java

@@ -253,7 +253,11 @@ public class SeekPurchaseServiceImpl implements SeekPurchaseService {
         } else {
             pageInfo.expression(PredicateUtils.gt("deadline", new Date(), false));
         }
+        if (status != null && status != 0) {
+            pageInfo.filter("status", status);
+        }
         pageInfo.filter("uu", user.getUserUU());
+        pageInfo.sorting("releaseDate", Direction.DESC);
         Page<SeekPurchaseGoods> pageSeeks = seekPurchaseGoodsDao.findAll(new Specification<SeekPurchaseGoods>() {
             public Predicate toPredicate(Root<SeekPurchaseGoods> root, CriteriaQuery<?> query,
                     CriteriaBuilder builder) {

src/main/webapp/resources/js/common/query/seekPurchase.js

@@ -24,7 +24,8 @@ define([ 'ngResource' ], function() {
       },
       getMallGoodsList: {
         url: 'seek/getMallGoodsList',
-        method: 'GET'
+        method: 'GET',
+        isArray: true
       },
       getSeekPurchaseOfferPageInfo: {
         url: 'seek/offer/getSeekPurchaseOfferPageInfo',

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -14,14 +14,15 @@ define(['app/app'], function(app) {
           $scope.seek.deadline = new Date();
           seekPurchase.saveOneSeekPurchase($scope.seek,function(data){
             $scope.seek = null;
+            $scope.seekPurchaseTableParams.reload();
             toaster.pop('success', '求购发布成功');
           }, function (res) {
             toaster.pop('error', res.data);
           });
         }
 
-        // 买家求购列表
-      // 获取当前卖家求购推送列表
+      // 买家求购列表
+      $scope.searchStatus = 0;
       $scope.seekPurchaseTableParams = new ngTableParams({
         page : 1,
         count : 5
@@ -29,9 +30,10 @@ define(['app/app'], function(app) {
         total : 0,
         getData : function ($defer, params) {
           const param = BaseService.parseParams(params.url());
+          param.isMallGoods = $scope.isMallGoods;
           param.deadline = $scope.deadline;
-          param.status = $scope.status;
           param.keyWord = $scope.keyWord;
+          param.status = $scope.searchStatus;
           param.minReleaseDate = $scope.startDate ? $scope.startDate.getTime() : null;
           param.maxReleaseDate = $scope.endDate ? $scope.endDate.getTime() : null;
           seekPurchase.getUserSeekPageInfo(param, function (data) {
@@ -49,7 +51,21 @@ define(['app/app'], function(app) {
         $scope.seekPurchaseTableParams.reload();
       }
 
+      $scope.offerCount = 0;
+      $scope.goodsCount = 0;
       $scope.setSeekStatus = function (seek, status) {
+        $scope.goodsCount = seek.goodsAmount;
+          // 查看报价
+          if (status == 2) {
+            seekPurchase.getSeekPurchaseOfferPageInfo({count:100,page:1,spId:seek.spId},function(data) {
+                $scope.offer = data.content;
+                $scope.offerCount = data.totalElements;
+            });
+          } else if (status == 1) {
+            seekPurchase.getMallGoodsList({spId: seek.spId}, function(data) {
+                $scope.goods = data;
+            });
+          }
           seek.$status = status;
       }
 

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -393,7 +393,7 @@
                 </div>
                 <div class="form-block single-price">
                     <span>单价预算</span>
-                    <select  ng-model="seek.currency">
+                    <select  ng-model="seek.currency" ng-init="seek.currency='RMB'">
                         <option value="RMB">￥</option>
                         <option value="USD">$</option>
                     </select>
@@ -413,7 +413,7 @@
         <!--搜索时间筛选-->
         <div class="screen" style="clear: both;background: #f5f8fe;height: 40px;margin-bottom: 15px;margin-top: 5px;padding-top: 4px;padding-right: 11px;">
             <div class="fl">
-                <input type="checkbox">&nbsp;有现货&nbsp;&nbsp;
+                <input type="checkbox" ng-model="isMallGoods" ng-change="onSearch()">&nbsp;有现货&nbsp;&nbsp;
                 截止时间&nbsp;
                 <select class="form-control select-adder" ng-model="deadline" ng-change="onSearch()" ng-init="deadline='全部'">
                     <option value="全部">全部</option>
@@ -469,7 +469,8 @@
                 <th width="99">生产日期</th>
                 <th width="76">截止时间</th>
                 <th width="81">
-                    <select class="select-adder" ng-model="status" ng-init="status=200" ng-change="onSearch()">
+                    <select class="select-adder" ng-model="searchStatus" ng-change="onSearch()">
+                        <option value="0">全部</option>
                         <option value="200">待报价</option>
                         <option value="201">已报价</option>
                         <option value="202">已采纳</option>
@@ -488,18 +489,22 @@
                 <td ng-bind="seek.encapsulation">盘装</td>
                 <td ng-bind="seek.produceDate">2012-12-12</td>
                 <td>剩余&nbsp;<span class="red-text">8</span>&nbsp;天</td>
-                <td>已报价</td>
+                <td ng-switch="seek.status">
+                    <span ng-switch-when="200" style="color:red;">待报价</span>
+                    <span ng-switch-when="201">已报价</span>
+                    <span ng-switch-when="202" style="color:green;">已采纳</span>
+                </td>
                 <td class="operate-seek">
-                    <span ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 2)">查看报价&nbsp;<i class="fa fa-angle-double-down"></i></span>
-                    <span ng-show="seek.$status && (seek.$status == 1 || seek.$status == 2)" ng-click="setSeekStatus(seek, 0)">收起&nbsp;<i class="fa fa-angle-double-up"></i></span>
+                    <span ng-if="seek.offerAmount>0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 2)">查看报价&nbsp;<i class="fa fa-angle-double-down"></i></span>
+                    <span ng-if="seek.offerAmount>0" ng-show="seek.$status && (seek.$status == 1 || seek.$status == 2)" ng-click="setSeekStatus(seek, 0)">收起&nbsp;<i class="fa fa-angle-double-up"></i></span>
                 </td>
             </tr>
             <tr class="expand-row" ng-if="seek.$status == 1 || seek.$status == 2">
                 <td colspan="10">
                     <div>
                         <div class="switch-line">
-                            <a ng-class="{'active': seek.$status == 1}" ng-click="setSeekStatus(seek, 1)">商城现货（<span>60</span>）</a>
-                            <a ng-class="{'active': seek.$status == 2}"  ng-click="setSeekStatus(seek, 2)">当前报价（<span>110</span>）</a>
+                            <a ng-class="{'active': seek.$status == 1}" ng-click="setSeekStatus(seek, 1)">商城现货（<span ng-bind="goodsCount"></span>）</a>
+                            <a ng-class="{'active': seek.$status == 2}"  ng-click="setSeekStatus(seek, 2)">当前报价（<span ng-bind="offerCount"></span>）</a>
                         </div>
                         <div ng-show="seek.$status == 1">
                             <table>
@@ -519,97 +524,19 @@
                             <div class="seek-list">
                                 <table>
                                     <tbody>
-                                    <tr>
+                                    <tr ng-repeat="go in goods">
                                         <td width="68"><input type="checkbox"></td>
-                                        <td width="103">哈哈哈</td>
-                                        <td width="126" class="red-text">4-6</td>
-                                        <td width="104" class="red-text">$123</td>
-                                        <td width="137">2012-12-12</td>
-                                        <td width="111">21412</td>
-                                        <td width="164" class="input-number"><span>-</span><input type="number"><span>+</span></td>
+                                        <td width="103" ng-bind="go.enterpriseName">哈哈哈</td>
+                                        <td width="126" class="red-text" ng-bind="go.minDelivery+'-'+go.maxDelivery">4-6</td>
+                                        <td width="104" class="red-text" ng-bind="go.currencyName">$123</td>
+                                        <td width="137" ng-bind="go.produceDate">2012-12-12</td>
+                                        <td width="111" ng-bind="go.reserve">21412</td>
+                                        <td width="164" class="input-number"><span>-</span><input type="number" ng-bind="go.minBuyQty"><span>+</span></td>
                                         <td width="186" class="operate">
                                             <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
                                             <span>立即购买</span>
                                         </td>
                                     </tr>
-                                    <tr>
-                                        <td><input type="checkbox"></td>
-                                        <td>哈哈哈</td>
-                                        <td class="red-text">4-6</td>
-                                        <td class="red-text">$123</td>
-                                        <td>2012-12-12</td>
-                                        <td>21412</td>
-                                        <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
-                                        <td class="operate">
-                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                            <span>立即购买</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="checkbox"></td>
-                                        <td>哈哈哈</td>
-                                        <td class="red-text">4-6</td>
-                                        <td class="red-text">$123</td>
-                                        <td>2012-12-12</td>
-                                        <td>21412</td>
-                                        <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
-                                        <td class="operate">
-                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                            <span>立即购买</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="checkbox"></td>
-                                        <td>哈哈哈</td>
-                                        <td class="red-text">4-6</td>
-                                        <td class="red-text">$123</td>
-                                        <td>2012-12-12</td>
-                                        <td>21412</td>
-                                        <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
-                                        <td class="operate">
-                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                            <span>立即购买</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="checkbox"></td>
-                                        <td>哈哈哈</td>
-                                        <td class="red-text">4-6</td>
-                                        <td class="red-text">$123</td>
-                                        <td>2012-12-12</td>
-                                        <td>21412</td>
-                                        <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
-                                        <td class="operate">
-                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                            <span>立即购买</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="checkbox"></td>
-                                        <td>哈哈哈</td>
-                                        <td class="red-text">4-6</td>
-                                        <td class="red-text">$123</td>
-                                        <td>2012-12-12</td>
-                                        <td>21412</td>
-                                        <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
-                                        <td class="operate">
-                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                            <span>立即购买</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td><input type="checkbox"></td>
-                                        <td>哈哈哈</td>
-                                        <td class="red-text">4-6</td>
-                                        <td class="red-text">$123</td>
-                                        <td>2012-12-12</td>
-                                        <td>21412</td>
-                                        <td class="input-number"><span>-</span><input type="number"><span>+</span></td>
-                                        <td class="operate">
-                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                            <span>立即购买</span>
-                                        </td>
-                                    </tr>
                                     </tbody>
                                 </table>
                             </div>
@@ -635,64 +562,14 @@
                             <div class="seek-list">
                                 <table>
                                     <tbody>
-                                    <tr>
-                                        <td width="173">深圳市优软科技</td>
-                                        <td width="196" class="red-text">4-6</td>
-                                        <td width="196"><span>$</span>9.86</td>
-                                        <td width="212">2012-12-12</td>
-                                        <td width="221" class="operate">
-                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                            <span>立即购买</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td width="173">深圳市优软科技</td>
-                                        <td width="196" class="red-text">4-6</td>
-                                        <td width="196"><span>$</span>9.86</td>
-                                        <td width="212">2012-12-12</td>
-                                        <td width="221" class="operate">
-                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                            <span>立即购买</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td width="173">深圳市优软科技</td>
-                                        <td width="196" class="red-text">4-6</td>
-                                        <td width="196"><span>$</span>9.86</td>
-                                        <td width="212">2012-12-12</td>
-                                        <td width="221" class="operate">
-                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                            <span>立即购买</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td width="173">深圳市优软科技</td>
-                                        <td width="196" class="red-text">4-6</td>
-                                        <td width="196"><span>$</span>9.86</td>
-                                        <td width="212">2012-12-12</td>
+                                    <tr ng-repeat="of in offer">
+                                        <td width="173" ng-bind="(of.enterprise).enName"></td>
+                                        <td width="196" class="red-text" ng-bind="of.minDay+'-'+of.maxDay">4-6</td>
+                                        <td width="196"><span ng-bind="of.currency+of.unitPrice">$9.86</span></td>
+                                        <td width="212" ng-bind="of.produceDate | date: 'yyyy-MM-dd'"></td>
                                         <td width="221" class="operate">
-                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                            <span>立即购买</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td width="173">深圳市优软科技</td>
-                                        <td width="196" class="red-text">4-6</td>
-                                        <td width="196"><span>$</span>9.86</td>
-                                        <td width="212">2012-12-12</td>
-                                        <td width="221" class="operate">
-                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                            <span>立即购买</span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td width="173">深圳市优软科技</td>
-                                        <td width="196" class="red-text">4-6</td>
-                                        <td width="196"><span>$</span>9.86</td>
-                                        <td width="212">2012-12-12</td>
-                                        <td width="221" class="operate">
-                                            <a>联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                            <span>立即购买</span>
+                                            <a href = "of.user.usertTel">联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <span>采纳报价</span>
                                         </td>
                                     </tr>
                                     </tbody>