Merge remote-tracking branch 'origin/release-20170915' into release-20170915

components/applyPurchase/ApplyInfo.vue

@@ -19,18 +19,18 @@
         <span>买家</span>
         <span>型号</span>
         <span>品牌</span>
-        <span>截止时间
-          <a href="javascript:void(0)" @click="sortListByParam('deadline')">
-            <!--<i class=" fa fa-long-arrow-up" :class="{active: sorting.deadline == 'ASC'}"></i>-->
-            <!--<i class=" fa fa-long-arrow-down" :class="{active: sorting.deadline == 'DESC'}"></i>-->
-          </a>
-        </span>
         <span>已报价
           <a href="javascript:void(0)" @click="sortListByParam('offerAmount')">
             <!--<i class=" fa fa-long-arrow-up" :class="{active: sorting.offerAmount == 'ASC'}"></i>-->
             <!--<i class=" fa fa-long-arrow-down" :class="{active: sorting.offerAmount == 'DESC'}"></i>-->
           </a>
         </span>
+        <span>截止时间
+          <a href="javascript:void(0)" @click="sortListByParam('deadline')">
+            <!--<i class=" fa fa-long-arrow-up" :class="{active: sorting.deadline == 'ASC'}"></i>-->
+            <!--<i class=" fa fa-long-arrow-down" :class="{active: sorting.deadline == 'DESC'}"></i>-->
+          </a>
+        </span>
         <span>操作</span>
       </p>
       <ul v-if="purchaseManList.content && purchaseManList.content.length">
@@ -40,6 +40,7 @@
           <div v-else>{{purchaseMan.userName | userNameFilter}}</div>
           <div :title="purchaseMan.cmpCode">{{purchaseMan.cmpCode || '-'}}</div>
           <div :title="purchaseMan.inbrand">{{purchaseMan.inbrand || '-'}}</div>
+          <div class="number-content"><img src="/images/applyPurchase/hot-fire.png" alt="" v-if="purchaseMan.offerAmount > 10"><span :style="purchaseMan.offerAmount > 10 ? 'color: #ff9a00': ''">{{purchaseMan.offerAmount || 0}}</span>&nbsp;条</div>
           <div class="date-content">
             <div v-if="purchaseMan.remainingTime > 0">
               <span>剩余&nbsp;</span>
@@ -50,13 +51,13 @@
             </div>
             <span v-if="!purchaseMan.remainingTime || purchaseMan.remainingTime <= 0">已截止</span>
           </div>
-          <div class="number-content"><img src="/images/applyPurchase/hot-fire.png" alt="" v-if="purchaseMan.offerAmount > 10"><span :style="purchaseMan.offerAmount > 10 ? 'color: #ff9a00': ''">{{purchaseMan.offerAmount || 0}}</span>&nbsp;条</div>
           <div class="btn-content">
             <!--<a @click="setLinkBoxIndex(index)">联系买家</a>-->
             <!--判断该求购是自己的-->
             <div class="is-say-price" v-if="purchaseMan.remainingTime > 0 && purchaseMan.quoted == 1">已报价 <img src="/images/applyPurchase/green-check.png" alt=""></div>
             <div v-else>
-              <a title="此为贵公司的求购" v-if="purchaseMan.remainingTime > 0 && (!purchaseMan.quoted || purchaseMan.quoted != 1) && (user.logged && ((purchaseMan.inquiry.enterprise && user.data.enterprise && (purchaseMan.inquiry.enterprise.uu === user.data.enterprise.uu)) || (!user.data.enterprise.uu && purchaseMan.userUU == user.data.userUU  && !purchaseMan.inquiry.enterprise)))" style="background: #cccbcb;">我要报价</a>
+              <a title="该求购已截止" v-if="!purchaseMan.remainingTime || purchaseMan.remainingTime <= 0" style="background: #cccbcb;" @click="sayPriceStop">我要报价</a>
+              <a title="此为贵公司的求购" v-if="purchaseMan.remainingTime > 0 && (!purchaseMan.quoted || purchaseMan.quoted != 1) && (user.logged && ((purchaseMan.inquiry.enterprise && user.data.enterprise && (purchaseMan.inquiry.enterprise.uu === user.data.enterprise.uu)) || (!user.data.enterprise.uu && purchaseMan.userUU == user.data.userUU  && !purchaseMan.inquiry.enterprise)))" style="background: #cccbcb;" @click="sayPriceSeft">我要报价</a>
               <a v-if="purchaseMan.remainingTime > 0 && (!purchaseMan.quoted || purchaseMan.quoted != 1) && !(user.logged && ((purchaseMan.inquiry.enterprise && user.data.enterprise && (purchaseMan.inquiry.enterprise.uu === user.data.enterprise.uu)) || (!user.data.enterprise.uu && purchaseMan.userUU == user.data.userUU  && !purchaseMan.inquiry.enterprise)))" @click="sayPrice(purchaseMan, index)">我要报价</a>
             </div>
           </div>
@@ -223,6 +224,12 @@
         this.nowPage = 1
         this.resetList()
       },
+      sayPriceStop: function () {
+        this.$message.error('该求购已截止')
+      },
+      sayPriceSeft: function () {
+        this.$message.error('此为贵公司的求购')
+      },
       sortListByParam: function (param) {
         if (this.sorting[param]) {
           if (this.sorting[param] === 'ASC') {