产权交易

src/views/biddingHall/index.vue

@@ -117,8 +117,8 @@
               color: {
                 '未开始': '#007E72',
                 '已结束': '#848484',
-                '进行中': '#c21F3a',
-              }[item.timeType]}" v-if="item.biddingType=='自由竞价'&&item.deadline>0">
+                '竞价中': '#c21F3a',
+              }[item.projectShowStatus]}" v-if="item.biddingType=='自由竞价'&&item.deadline>0">
                 *
               </span>
 
@@ -126,8 +126,8 @@
               color: {
                 '未开始': '#007E72',
                 '已结束': '#848484',
-                '进行中': '#c21F3a',
-              }[item.timeType]}" v-if="(item.biddingType!='自由竞价'&&item.money) || item.deadline<=0">
+                '竞价中': '#c21F3a',
+              }[item.projectShowStatus]}" v-if="(item.biddingType!='自由竞价'&&item.money) || item.deadline<=0">
                 {{item.money}}{{item.priceUnit}}
               </span>
 
@@ -135,8 +135,8 @@
               color: {
                 '未开始': '#007E72',
                 '已结束': '#848484',
-                '进行中': '#c21F3a',
-              }[item.timeType]}" v-if="item.biddingType!='自由竞价'&&!item.money">
+                '竞价中': '#c21F3a',
+              }[item.projectShowStatus]}" v-if="item.biddingType!='自由竞价'&&!item.money">
                 暂无出价
               </span>
 
@@ -146,8 +146,8 @@
                 color: {
                   '未开始': '#007E72',
                   '已结束': '#848484',
-                  '进行中': '#c21F3a',
-                }[item.timeType]}">{{item.timeType}}</p>
+                  '竞价中': '#c21F3a',
+                }[item.projectShowStatus]}">{{item.projectShowStatus}}</p>
           </div>
           <div class="list_li_time">
             <p>
@@ -259,7 +259,6 @@ export default {
     getList(){
       this.queryParams.deptId = this.activeId;
       this.queryParams.projectNumber = this.value1;
-      this.queryParams.projectShowStatus = this.value3;
       getBiddingList(this.queryParams).then(response =>{
         response.rows.map(item => {
           if(item.biddingStopTime != null || item.biddingStartTime != null){
@@ -296,9 +295,9 @@ export default {
               time = endDate-nowDate>0?endDate-nowDate:0
             }
             console.log(time)
-            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:time,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,timeType:item.timeType,biddingStopTime:item.biddingStopTime,biddingStartTime:item.biddingStartTime})
+            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:time,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,projectShowStatus:item.projectShowStatus,biddingStopTime:item.biddingStopTime,biddingStartTime:item.biddingStartTime})
           }else{
-            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,timeType:item.timeType,biddingStopTime:item.biddingStopTime,biddingStartTime:item.biddingStartTime})
+            this.infoList.push({content:item.projectName,biddingType:item.biddingType,deadline:0,currentPrice:item.price,priceUnit:item.unit,id:item.id,money:item.money,projectShowStatus:item.projectShowStatus,biddingStopTime:item.biddingStopTime,biddingStartTime:item.biddingStartTime})
           }
         })
         if(this.infoList.length >= response.total){