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

---
 .../announcementList/inviteTendersDetail.js   | 15 +++++++++++++--
 .../announcementList/winTheBiddingDetail.js   | 19 ++++++++++++++++---
 view/announcement/inviteTendersDetail.html    | 12 ++++++++++++
 view/announcement/winTheBiddingDetail.html    | 14 +++++++++++++-
 4 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/static/js/project/announcementList/inviteTendersDetail.js b/static/js/project/announcementList/inviteTendersDetail.js
index a4a616e..4e6551f 100644
--- a/static/js/project/announcementList/inviteTendersDetail.js
+++ b/static/js/project/announcementList/inviteTendersDetail.js
@@ -24,6 +24,17 @@ define(['jquery', "template", "Tools", "announApi", "paging", 'swiper'], functio
         tools.getWebConfig();
     };
 
+    //竞价方式
+    module.biddingTypeDictionaries = function (data) {
+        if (data.code == 200) {
+            var content = data.data;
+            var biddingType = content[(module.data.announcementInformationDetail.biddingType-1)].dictLabel;
+            module.data.announcementInformationDetail.biddingType = biddingType;
+            var announcementInformationData = template('announcementInformationData', module.data);
+            $("#announcementInformationContent").html(announcementInformationData);
+        }
+    }
+
     //焦点图数据
     module.focusNewsTop = function (data) {
         if (data.code == 200) {
@@ -87,14 +98,14 @@ define(['jquery', "template", "Tools", "announApi", "paging", 'swiper'], functio
             //console.log(data)
             var content = data.data;
             module.data.announcementInformationDetail = content;
-            var announcementInformationData = template('announcementInformationData', module.data);
-            $("#announcementInformationContent").html(announcementInformationData);
             let query = {
                 tableName: 't_transaction_tender',
                 bizPath: 'transaction',
                 tableId:content.id
             }
             tools.doGet(attachmentQuery, query, module.attachmentQuery,true);
+            //竞价方式字典
+            tools.doGet(Dictionaries+'/bidding_type', {}, module.biddingTypeDictionaries,true);
         }
     }
 
diff --git a/static/js/project/announcementList/winTheBiddingDetail.js b/static/js/project/announcementList/winTheBiddingDetail.js
index 7f329b9..7822716 100644
--- a/static/js/project/announcementList/winTheBiddingDetail.js
+++ b/static/js/project/announcementList/winTheBiddingDetail.js
@@ -80,20 +80,33 @@ define(['jquery', "template", "Tools", "announApi", "paging", 'swiper'], functio
         }
     }
 
+    //竞价方式
+    module.biddingTypeDictionaries = function (data) {
+        if (data.code == 200) {
+            var content = data.data;
+            if (module.data.announcementInformationDetail.biddingType){
+                var biddingType = content[(module.data.announcementInformationDetail.biddingType-1)].dictLabel;
+                module.data.announcementInformationDetail.biddingType = biddingType;
+            }
+            var announcementInformationData = template('announcementInformationData', module.data);
+            $("#announcementInformationContent").html(announcementInformationData);
+        }
+    }
+
     //项目公告数据
     module.announInformation = function (data) {
         if (data.code == 200) {
             //console.log(data)
             var content = data.data;
             module.data.announcementInformationDetail = content;
-            var announcementInformationData = template('announcementInformationData', module.data);
-            $("#announcementInformationContent").html(announcementInformationData);
             let query = {
                 tableName: 't_transaction_tender_win',
                 bizPath: 'transaction',
                 tableId:content.id
             }
             tools.doGet(attachmentQuery, query, module.attachmentQuery,true);
+            //竞价方式字典
+            tools.doGet(Dictionaries+'/bidding_type', {}, module.biddingTypeDictionaries,true);
         }
     }
 
@@ -163,4 +176,4 @@ define(['jquery', "template", "Tools", "announApi", "paging", 'swiper'], functio
     }
 
     return module;
-});
\ No newline at end of file
+});
diff --git a/view/announcement/inviteTendersDetail.html b/view/announcement/inviteTendersDetail.html
index ef67b1f..5ffcb19 100644
--- a/view/announcement/inviteTendersDetail.html
+++ b/view/announcement/inviteTendersDetail.html
@@ -191,6 +191,18 @@
                     <td>项目规模</td>
                     <td>{{announcementInformationDetail.scale}}</td>
                 </tr>
+                <tr>
+                    <td>竞价方式</td>
+                    <td>{{announcementInformationDetail.biddingType}}</td>
+                    <td>单价(元)</td>
+                    <td>{{announcementInformationDetail.tenderPrice}}</td>
+                </tr>
+                <tr>
+                    <td>数量单位</td>
+                    <td>{{announcementInformationDetail.priceUnit}}</td>
+                    <td>数量/面积</td>
+                    <td>{{announcementInformationDetail.areaCount}}</td>
+                </tr>
                 <tr>
                     <td>招标内容</td>
                     <td colspan="3">{{announcementInformationDetail.tenderContent}}</td>
diff --git a/view/announcement/winTheBiddingDetail.html b/view/announcement/winTheBiddingDetail.html
index ad6a604..0b5c6da 100644
--- a/view/announcement/winTheBiddingDetail.html
+++ b/view/announcement/winTheBiddingDetail.html
@@ -158,9 +158,21 @@
                 <tr>
                     <td>项目负责人</td>
                     <td>{{announcementInformationDetail.partLinkman}}</td>
-                    <td>中标价格</td>
+                    <td>中标金额(元)</td>
+                    <td>{{announcementInformationDetail.price}}</td>
+                </tr>
+                <tr>
+                    <td>竟价方式</td>
+                    <td>{{announcementInformationDetail.biddingType}}</td>
+                    <td>中标单价(元)</td>
                     <td>{{announcementInformationDetail.transactionPrice}}</td>
                 </tr>
+                <tr>
+                    <td>数量/面积</td>
+                    <td>{{announcementInformationDetail.areaCount}}</td>
+                    <td>数量单位</td>
+                    <td>{{announcementInformationDetail.priceUnit}}</td>
+                </tr>
                 <tr>
                     <td>中标日期</td>
                     <td>{{announcementInformationDetail.dealTime}}</td>