From f37fc5731062249a897a77301f9ab04456ef0103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Tue, 10 Oct 2023 14:56:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/biddingHall/index.vue          |  2 +-
 src/views/notice/inviteTendersDetail.vue | 10 +++++++---
 src/views/notice/winTheBiddingDetail.vue | 15 +++++++++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/views/biddingHall/index.vue b/src/views/biddingHall/index.vue
index 2124ced6..0f1fe838 100644
--- a/src/views/biddingHall/index.vue
+++ b/src/views/biddingHall/index.vue
@@ -212,7 +212,7 @@ export default {
       value2: '标的物位置',
       activeId: null,
       activeIndex: 0,
-      value3: '',
+      value3: '正在竞价',
       value:"",
       info:[],
       //标的物所在地
diff --git a/src/views/notice/inviteTendersDetail.vue b/src/views/notice/inviteTendersDetail.vue
index f0b62a08..d7d0a307 100644
--- a/src/views/notice/inviteTendersDetail.vue
+++ b/src/views/notice/inviteTendersDetail.vue
@@ -26,6 +26,10 @@
     <van-cell title="投标人要求" :value="attestationDetail.condition" />
 <!--    <van-cell title="保证金" :value="attestationDetail.deposit" />-->
     <van-cell title="预算总额(元)" :value="attestationDetail.price" />
+    <van-cell title="竞价方式" :value="attestationDetail.biddingType" />
+    <van-cell title="单价(元)" :value="attestationDetail.tenderPrice" />
+    <van-cell title="数量单位" :value="attestationDetail.priceUnit" />
+    <van-cell title="数量/面积" :value="attestationDetail.areaCount" />
     <van-cell title="招标发布日期" :value="attestationDetail.logintime" />
     <van-cell title="招标书领取开始日期" :value="attestationDetail.startTime" />
     <van-cell title="招标书领取结束日期" :value="attestationDetail.stopTime" />
@@ -61,9 +65,9 @@ export default {
       tenderDetail(this.$route.query.id,{translate_dict:1}).then(response => {
         this.attestationDetail = response.data;
         // //公司性质字典
-        // this.getDicts("company_nature").then(res => {
-        //   this.attestationDetail.companyNature = this.selectDictLabel(res.data,response.data.companyNature);
-        // });
+        this.getDicts("tenderbid_type").then(res => {
+          this.attestationDetail.biddingType = this.selectDictLabel(res.data,response.data.biddingType);
+        });
       });
       let query = {
         tableName: 't_transaction_tender',
diff --git a/src/views/notice/winTheBiddingDetail.vue b/src/views/notice/winTheBiddingDetail.vue
index 4b0d54f1..4aa69b7b 100644
--- a/src/views/notice/winTheBiddingDetail.vue
+++ b/src/views/notice/winTheBiddingDetail.vue
@@ -13,7 +13,13 @@
     <van-cell title="中标人" :value="attestationDetail.assignee" />
     <van-cell title="建设单位" :value="attestationDetail.bulidPart" />
     <van-cell title="项目负责人" :value="attestationDetail.partLinkman" />
-    <van-cell title="中标价格" :value="attestationDetail.transactionPrice" />
+    <van-cell title="中标金额(元)" :value="attestationDetail.price" />
+
+    <van-cell title="竟价方式" :value="attestationDetail.biddingType" />
+    <van-cell title="中标单价(元)" :value="attestationDetail.transactionPrice" />
+    <van-cell title="数量/面积" :value="attestationDetail.areaCount" />
+    <van-cell title="数量单位" :value="attestationDetail.priceUnit" />
+
     <van-cell title="中标日期" :value="attestationDetail.dealTime" />
     <van-cell title="公示开始日期" :value="attestationDetail.startTime" />
     <van-cell title="公示结束日期" :value="attestationDetail.stopTime" />
@@ -29,7 +35,7 @@
 </template>
 
 <script>
-  import {attachmentQuery, tenderWinDetail} from "@/api/notice/index";
+  import {attachmentQuery, tenderDetail, tenderWinDetail} from "@/api/notice/index";
 export default {
   name: "noticeDetail",
   data() {
@@ -47,6 +53,11 @@ export default {
       console.log(this.$route.query.id)
       tenderWinDetail(this.$route.query.id,{translate_dict:1}).then(response => {
         this.attestationDetail = response.data;
+        tenderDetail(response.data.tenderId,{translate_dict:1}).then(response2 => {
+          this.getDicts("tenderbid_type").then(res => {
+            this.$set(this.attestationDetail,'biddingType',this.selectDictLabel(res.data,response2.data.biddingType))
+          });
+        });
       });
       let query = {
         tableName: 't_transaction_tender_win',