Merge remote-tracking branch 'origin/release-201826-wangcz' into release-201826-wangcz

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

@@ -23,7 +23,7 @@ define([ 'ngResource' ], function() {
                 method: 'POST'
             },
             saveOffer: {
-                url: 'http://10.1.51.82:24002/inquiry/sale/item/saveQuote',
+                url: 'http://218.17.158.219:24000//inquiry/sale/item/saveQuote',
                 method: 'POST'
             },
             saveOfferProd: {

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

@@ -593,11 +593,11 @@
                     <div class="fl title">规格：{{bomInfo.spec || '-'}}</div>
                     <div class="title pull-right" style="font-size: 14px;color: #333;">本单共<span style="color: #fd7748;margin-right: 0px;font-size: 14px">{{bomInfo.amount }}</span>个产品，<span style="color: #fd7748;margin-right: 0px;font-size: 14px">{{bomInfo.quotedAmount || 0}}</span>个已报价(其中{{bomInfo.replaceQuotedAmount || 0}}个为替代料报价)</div>
                 </div>
-                <div class="clearfix">
+                <div class="clearfix" ng-hide="bomInfo.quotedAmount > 0 && bomInfo.minPriceSum === 0">
                     <div class="fl title">采购数量(套)：{{bomInfo.count || 0}}</div>
                     <div class="title pull-right">价格分析:按价格最低<span style="color: #fd7748;margin-right: 0px;font-size: 14px">{{bomInfo.quotedAmount || 0}}</span>个报告,合计¥:<span style="color: #008000;margin-right: 0px;font-size: 14px">{{bomInfo.minPriceSum || 0}}</span></div>
                 </div>
-                <div class="clearfix">
+                <div class="clearfix"  ng-hide="bomInfo.quotedAmount > 0 && bomInfo.minDeliverySum === 0">
                     <div class="fl title">发布时间：{{bomInfo.date | date:'yyyy-MM-dd HH:mm:ss'}}</div>
                     <div class="title pull-right">按交期最短<span style="color: #fd7748;margin-right: 0px;font-size: 14px">{{bomInfo.quotedAmount || 0}}</span>个报告,合计¥:<span style="color: #008000;margin-right: 0px;font-size: 14px">{{bomInfo.minDeliverySum || 0}}</span></div>
                 </div>