2 Commits f28c0c8968 ... 87e899e4ca

Auteur SHA1 Message Date
  fan0987 87e899e4ca no message il y a 1 semaine
  fan0987 fb7b1878c2 专家已评标状态 il y a 1 semaine

+ 11 - 13
ruoyi-ui/src/views/expert/tender/detail.vue

@@ -55,12 +55,6 @@
         <el-descriptions-item label="供应商库名称" :span="1">
           {{ plan.materialName }}
         </el-descriptions-item>
-        <!-- <el-descriptions-item label="报名数量" :span="1">
-          {{ tender.signNumber }}
-        </el-descriptions-item>
-        <el-descriptions-item label="已交保证金数量" :span="1">
-          {{ tender.enrollNumber }}
-        </el-descriptions-item> -->
       </el-descriptions>
 
       <el-table v-if="isOverFirstTime" :data="quoteTableData" border style="width: 100%;margin-top: 20px;">
@@ -68,15 +62,14 @@
         <el-table-column v-if="isOverFirstTime" label="报价" prop="quotePrice" align="center">
           <template slot-scope="scope">
             <span v-if="tender.sProjectState != 8">
-              {{ scope.row.third ? scope.row.third : (scope.row.second ? scope.row.second : scope.row.first) }}
+              {{ scope.row.quotePrice }}
             </span>
             <span v-else>*</span>
           </template>
         </el-table-column>
         <el-table-column v-if="isOverFirstTime" label="报价时间" prop="quoteTime" align="center">
           <template slot-scope="scope">
-            {{ scope.row.thirdTime ? scope.row.thirdTime : (scope.row.secondTime ? scope.row.secondTime :
-              scope.row.firstTime) }}
+            {{ scope.row.quoteTime }}
           </template>
         </el-table-column>
         <el-table-column label="标书" align="center">
@@ -90,7 +83,7 @@
           <template slot-scope="scope">
             <router-link :to="`/expert/expertScore?sid=${scope.row.sid}&hid=${scope.row.hid}&hName=${scope.row.hName}`">
               <el-button size="mini" type="text">
-                <span v-if="pingfenRecord && pingfenRecord.includes(scope.row.hid)">已</span>评分
+                <span v-if="scope.row.state">已</span>评分
               </el-button>
             </router-link>
           </template>
@@ -106,7 +99,7 @@ import { getPlan } from '@/api/system/plan'
 import { getMateriel } from "@/api/mast/materiel";
 import { getPlanProfileByAid } from "@/api/system/planprofile"
 import { selectBidNoticeBySid } from "@/api/system/tender/tenderNotice";
-import { listQuote } from '@/api/system/quote';
+import { getToMarkList, listQuote } from '@/api/system/quote';
 import TenderDetails from '@/components/tender/tenderDetails.vue'
 
 import {
@@ -224,7 +217,7 @@ export default {
       }
     },
     async getListQuote () {
-      const res = await listQuote({ sid: this.sid })
+      const res = await getToMarkList({ sid: this.sid })
       this.quoteTableData = res.data.map(item => {
         const filePath = item.filePath
         let fjAnnex = []
@@ -240,17 +233,22 @@ export default {
 
       this.isOverFirstTime = currentTime.isAfter(kaibiaoTime)
 
-      if (this.quoteTableData && this.quoteTableData.length > 0) {
+      console.log(this.quoteTableData);
+
+      if (this.isOverFirstTime) {
+        console.log(1);
         clearInterval(this.refreshQuoteTimer)
       }
     },
 
     refreshPage () {
+      console.log(2);
       this.refreshQuoteTimer = setInterval(this.getListQuote, 10000)
     }
   },
 
   activated () {
+    console.log(3);
     this.refreshPage()
   },
 

+ 1 - 1
ruoyi-ui/src/views/tender/tender1/components/exportCost.js

@@ -139,5 +139,5 @@ export const downloadCostFile = async (committeeList, price, sName, uKaiTime) =>
     const blob = new Blob([buffer], {
       type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
     });
-    saveAs(blob, `手动退款.xlsx`);
+    saveAs(blob, `${sName}评审费.xlsx`);
 }