From e9f78c8b4921f0bf9e63bee30d2ace85da068981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Sun, 8 Oct 2023 17:26:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E4=BA=A4=E5=87=BA=E4=BB=B7=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project/index.vue         | 20 +++++++++++++++-----
 src/views/project/projectDetail.vue |  7 ++++---
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index 053c7fd7..7b50f527 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -5,8 +5,8 @@
     <van-tabs v-model="active" color="#007b76" title-active-color="#007b76" @change="tabChange">
       <van-tab title="供应项目">
         <van-dropdown-menu>
-          <van-dropdown-item v-model="value1" :options="projectTypeOption" @change="getList"/>
-          <van-dropdown-item :value="value2" :title="value2" ref="item">
+          <van-dropdown-item v-model="value1" :options="projectTypeOption" @change="getList('search')"/>
+          <van-dropdown-item v-model="value2" :title="value2" ref="item">
             <van-tree-select
               :active-id.sync="activeId"
               :items="deptListOption"
@@ -16,7 +16,7 @@
               @click-nav="clickNav"
             />
           </van-dropdown-item>
-          <van-dropdown-item v-model="value3" :options="option3" @change="getList"/>
+          <van-dropdown-item v-model="value3" :options="option3" @change="getList('search')"/>
         </van-dropdown-menu>
         <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="getList">
           <router-link :to="{path:'project/projectDetail',query:{id:item.id}}" v-for="(item,index) in infoList" :key="index">
@@ -184,9 +184,19 @@ export default {
       }
       this.loading = false;
     },
-    getList(){
+    getList(type){
+      console.log(this.queryDatas)
       console.log(this.value1)
+      console.log(this.value3)
+      if (type == 'search'){
+        this.queryDatas.pageNum = 1;
+        this.infoList=[];
+        this.finished = false;
+      }
       this.loading = true;
+      this.queryDatas.deptId = this.activeId;
+      this.queryDatas.projectNumber = this.value1;
+      this.queryDatas.projectShowStatus = this.value3;
       getOutProjectList(this.queryDatas).then(response =>{
         // console.log(response)
         // this.infoList = response.rows
@@ -252,7 +262,7 @@ export default {
       }else{
         this.value2=data.text
       }
-      this.getList()
+      this.getList('search')
       this.$refs.item.toggle();
     },
   },
diff --git a/src/views/project/projectDetail.vue b/src/views/project/projectDetail.vue
index 134ed3af..7f98fd65 100644
--- a/src/views/project/projectDetail.vue
+++ b/src/views/project/projectDetail.vue
@@ -434,11 +434,12 @@ export default {
             }else if (response.rows.length>0&&!that.detail.ladderPrice){
               if (that.price == 0){return;}
               that.price = response.rows[0].money
-            }else{
+            }
+            else{
               if (that.detail.biddingDirect == 2 ||that.detail.biddingDirect == '反向竞价') {
-                that.price = parseFloat(that.detail.price - that.detail.ladderPrice).toFixed(2)
+                that.price = parseFloat(that.detail.price).toFixed(2)
               }else{
-                that.price = parseFloat(that.detail.price + that.detail.ladderPrice).toFixed(2)
+                that.price = parseFloat(that.detail.price).toFixed(2)
               }
             }
           }