liusw пре 8 година
родитељ
комит
71be50ad71

+ 14 - 0
src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchaseOfferGoods.java

@@ -164,6 +164,12 @@ public class SeekPurchaseOfferGoods {
     @Column(name = "sp_deadline")
     private Date deadline;
 
+    /**
+     * bom_id
+     */
+    @Column(name = "bom_id")
+    private Long bomId;
+
     /**
      * 剩余时间
      */
@@ -349,4 +355,12 @@ public class SeekPurchaseOfferGoods {
     public void setSpUu(Long spUu) {
         this.spUu = spUu;
     }
+
+    public Long getBomId() {
+        return bomId;
+    }
+
+    public void setBomId(Long bomId) {
+        this.bomId = bomId;
+    }
 }

+ 14 - 0
src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchasePushGoods.java

@@ -144,6 +144,12 @@ public class SeekPurchasePushGoods {
     @Column(name = "go_enuu")
     private Long goEnUu;
 
+    /**
+     * bom_id
+     */
+    @Column(name = "bom_id")
+    private Long bomId;
+
     /**
      * 剩余时间
      */
@@ -314,4 +320,12 @@ public class SeekPurchasePushGoods {
     public Long getRemainingTime() {
        return deadline.getTime() - System.currentTimeMillis();
     }
+
+    public Long getBomId() {
+        return bomId;
+    }
+
+    public void setBomId(Long bomId) {
+        this.bomId = bomId;
+    }
 }

+ 1 - 1
src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -878,7 +878,7 @@
                     <img src="static/img/seekPurchase/Excel.png" alt="">
                     <div>
                         <p ng-bind="bom.name"></p>
-                        <div>共 <span class="blue-text" ng-bind="bom.productAmount"></span> 个产品,<span class="red-text" ng-bind="bom.offerAmount">10</span> 个有报价,<span class="red-text" ng-bind="bom.goodsAmount">7</span> 个有现货</div>
+                        <div>共 <span class="blue-text" ng-bind="bom.productAmount || 0"></span> 个产品,<span class="red-text" ng-bind="bom.offerAmount || 0">10</span> 个有报价,<span class="red-text" ng-bind="bom.goodsAmount || 0">7</span> 个有现货</div>
                         <div ng-bind="bom.releaseDate | date:'yyyy-MM-dd HH:mm:ss'"></div>
                     </div>
                     <a href="user#/bomDetail/{{bom.bomId}}" class="fr">查看详情</a>

+ 3 - 2
src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -421,6 +421,7 @@
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
+    <!--
     <div class="BOM-header">
         <a ng-click="toogleType('bomManage')">&lt;返回</a>
         <div>
@@ -431,7 +432,7 @@
                 配单分析:<span>本单共<span class="blue-text">100</span>个产品,<span class="red-text">10</span>个有报价。</span><br/><b class="red-text">81</b>个有现货
             </div>
         </div>
-    </div>
+    </div>-->
     <div class="oder">
         <div class="oder01">
             <ul>
@@ -522,7 +523,7 @@
                     <div class="seek-status">
                         <div ng-show="seek.goodsEnuu" class="status">已在库</div>
                         <div ng-show="!seek.goodsEnuu" class="no-grounding">未在库</div>
-                        <div class="BOM-list-btn">BOM清单</div>
+                        <div class="BOM-list-btn" ng-if="bomId">BOM清单</div>
                         <a ng-show="!seek.goodsEnuu" target="_blank" href="vendor#/vendor_upload">产品导入>></a>
                     </div>
                 </td>

+ 3 - 2
src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -362,6 +362,7 @@
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
+    <!--
     <div class="BOM-header">
         <a ng-click="toogleType('bomManage')">&lt;返回</a>
         <div>
@@ -372,7 +373,7 @@
                 配单分析:<span>本单共<span class="blue-text">100</span>个产品,<span class="red-text">10</span>个有报价。</span><br/><b class="red-text">81</b>个有现货
             </div>
         </div>
-    </div>
+    </div>-->
     <div class="oder">
         <div class="oder01">
             <ul>
@@ -457,7 +458,7 @@
                         <span ng-bind="seek.releaseDate | date:'HH:mm:ss'"></span>
                         <div class="seek-status">
                             <div class="status">已在库</div>
-                            <div class="BOM-list-btn">BOM清单</div>
+                            <div class="BOM-list-btn" ng-if="seek.bomId">BOM清单</div>
                         </div>
                     </td>
                     <td class="user-name"><div title="{{seek.userName}}" ng-bind="seek.userName"></div></td>