验收结果处理和Bom求购实体类

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

@@ -149,6 +149,12 @@ public class SeekPurchase {
     @Transient
     private Long remainingTime;
 
+    /**
+     * Bom清单id
+     */
+    @Column(name = "bom_id")
+    private Long bomId;
+
     public Long getId() {
         return id;
     }
@@ -305,4 +311,12 @@ public class SeekPurchase {
     public Long getRemainingTime() {
         return deadline.getTime() - System.currentTimeMillis();
     }
+
+    public Long getBomId() {
+        return bomId;
+    }
+
+    public void setBomId(Long bomId) {
+        this.bomId = bomId;
+    }
 }

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

@@ -0,0 +1,106 @@
+package com.uas.platform.b2c.trade.seek.model;
+
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * Bom求购
+ *
+ * @author liusw
+ * @version 2018/1/11 17:09
+ */
+@Entity(name = "trade.seekPurchaseBom")
+@Table(name = "trade$seekPurchaseBom")
+public class SeekPurchaseBom {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @Id
+    @GeneratedValue
+    @Column(name = "bom_id")
+    private Long id;
+
+    /**
+     * Bom名称
+     */
+    @Column(name = "bom_name")
+    private String name;
+
+    /**
+     * 发布时间
+     */
+    @Column(name = "bom_release_date")
+    private Date releaseDate;
+
+    /**
+     * 总数
+     */
+    @Column(name = "bom_amount")
+    private Integer amount;
+
+    /**
+     * uu号
+     */
+    @Column(name = "bom_uu")
+    private Long uu;
+
+    /**
+     * 企业uu号
+     */
+    @Column(name = "bom_enuu")
+    private Long enuu;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Date getReleaseDate() {
+        return releaseDate;
+    }
+
+    public void setReleaseDate(Date releaseDate) {
+        this.releaseDate = releaseDate;
+    }
+
+    public Integer getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Integer amount) {
+        this.amount = amount;
+    }
+
+    public Long getUu() {
+        return uu;
+    }
+
+    public void setUu(Long uu) {
+        this.uu = uu;
+    }
+
+    public Long getEnuu() {
+        return enuu;
+    }
+
+    public void setEnuu(Long enuu) {
+        this.enuu = enuu;
+    }
+}

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

@@ -13,6 +13,8 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 
 /**
+ * 求购与产品关联，是否有现货判断
+ *
  * @author liusw
  * @version 2017/12/30 16:41
  */

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

@@ -17,7 +17,7 @@ import javax.persistence.Transient;
 import javax.swing.plaf.basic.BasicInternalFrameTitlePane.SystemMenuBar;
 
 /**
- * 卖家报价与库存的视图
+ * 卖家报价与产品关联，判断是否在库
  *
  * @author liusw
  * @version 2017/12/20 15:13

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

@@ -13,6 +13,8 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 
 /**
+ * 推送给卖家的求购信息
+ *
  * @author liusw
  * @version 2017/12/30 11:25
  */

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

@@ -95,8 +95,8 @@ define(['app/app'], function (app) {
             }
           }
           $scope.onProduceDateChange = function () {
-            if ($scope.sayPriceObj.produceDate && getRealLen($scope.sayPriceObj.produceDate) > 12) {
-              $scope.sayPriceObj.produceDate = $scope.sayPriceObj.produceDate.substring(0, $scope.sayPriceObj.produceDate.length - 1)
+            if ($scope.applyObj.produceDate && getRealLen($scope.applyObj.produceDate) > 12) {
+              $scope.applyObj.produceDate = $scope.applyObj.produceDate.substring(0, $scope.applyObj.produceDate.length - 1)
             }
           }
           $scope.checkAmount = function () {

src/main/webapp/resources/js/vendor/controllers/forstore/purchase_offer_ctrl.js

@@ -15,7 +15,7 @@ define(['app/app'], function(app) {
         // 获取我的报价列表
         $scope.seekPurchaseTableParams = new ngTableParams({
             page : 1,
-            count : 5
+            count : 10
         }, {
             total : 0,
             getData : function ($defer, params) {

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

@@ -131,7 +131,7 @@ define(['app/app'], function (app) {
 
           $scope.onProduceDateChange = function () {
             if ($scope.offer.produceDate && getRealLen($scope.offer.produceDate) > 12) {
-              $scope.offer.produceDate = $scope.offer.produceDate.substring(0, $scope.offer.produceDate.length - 1);
+              $scope.offer.produceDate = $scope.offer.produceDate.substring(0, 6);
             }
           }
 

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

@@ -232,6 +232,8 @@
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td{
         text-align: center;
         font-size: 14px;
+        position: relative;
+        font-size: 12px;
     }
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td {
         height: 48px;
@@ -248,6 +250,11 @@
         width: 100px;
         margin: 0 auto;
     }
+    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.operate >img {
+        position: absolute;
+        right: 0;
+        top: 0;
+    }
     .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.input-number input {
         width: 80px;
         height: 26px;
@@ -641,7 +648,8 @@
                                         <td width="186"><span>{{of.currency + of.unitPrice | currencyStr}}</span></td>
                                         <td width="195" ng-bind="of.produceDate || '-'"></td>
                                         <td width="221" class="operate">
-                                            <a href = "of.user.usertTel">联系卖家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <a href = "of.user.usertTel">联系卖家<img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
+                                            <img ng-if="of.status == 202" src="static/img/seekPurchase/recieved.png" alt="" class="ng-scope">
                                             <span ng-if="seek.status != 202" ng-click="setShowUseFlag(true, of)">采纳报价</span>
                                         </td>
                                     </tr>

src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -30,7 +30,6 @@
     }
     .seek-purchase .seek-purchase-content .seek-purchase-title .seek-rate span {
         display: inline-block;
-        width: 44px;
         height: 24px;
         line-height: 24px;
         background: #4290f7;
@@ -39,6 +38,7 @@
         border-radius: 3px;
         position: relative;
         margin-left: 10px;
+        padding:2px;
     }
     .seek-purchase .seek-purchase-content .seek-purchase-title .seek-rate span::before {
         content: '';
@@ -451,7 +451,7 @@
                     <span ng-bind="seek.releaseDate | date:'HH:mm:ss'"></span>
                     <div class="seek-status">
                         <div ng-show="!seek.goodsEnuu" class="no-grounding">未在库</div>
-                        <a ng-show="!seek.goodsEnuu" href="vendor#/vendor_upload">产品导入>></a>
+                        <a ng-show="!seek.goodsEnuu" target="_blank" href="vendor#/vendor_upload">产品导入>></a>
                         <div ng-show="seek.goodsEnuu">已在库</div>
                     </div>
                 </td>