Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/expert/ewh/components/fuijanTable.vue

@@ -18,6 +18,8 @@
             </el-table-column>
         </el-table>
 
+        <a href="/专家注册诚信承诺书.docx" target="_blank" class="fujian-link">下载诚信承诺书</a>
+
         <el-dialog title="附件管理" :visible.sync="dialogFormVisible">
             <el-form :model="fujianForm">
                 <el-form-item label="附件" prop="fjAnnex">
@@ -65,6 +67,10 @@ export default {
                 name: '银行卡清晰照片（必传）',
                 type: 'jBankPhoto',
                 fileList: []
+            }, {
+                name: '专家注册诚信承诺（必传）',
+                type: 'jCommit',
+                fileList: []
             }, {
                 name: '其他证明材料',
                 type: 'jOther',
@@ -143,4 +149,13 @@ export default {
         }
     }
 }
-</script>
+</script>
+
+<style lang="scss" scoped>
+.fujian-link {
+    text-decoration: underline;
+    color: #409EFF;
+    line-height: 38px;
+    font-weight: bold;
+}
+</style>

ruoyi-ui/src/views/expert/ewh/detail.vue

@@ -129,6 +129,10 @@ export default {
                 name: '银行卡清晰照片',
                 type: 'jBankPhoto',
                 fileList: []
+            }, {
+                name: '专家注册诚信承诺',
+                type: 'jCommit',
+                fileList: []
             }, {
                 name: '其他证明材料',
                 type: 'jOther',
@@ -155,6 +159,7 @@ export default {
             jCertificatePhoto: this.basicDetail.jCertificatePhoto ? JSON.parse(this.basicDetail.jCertificatePhoto) :[],
             jScreenshot: this.basicDetail.jScreenshot ? JSON.parse(this.basicDetail.jScreenshot) : [],
             jBankPhoto: this.basicDetail.jBankPhoto ? JSON.parse(this.basicDetail.jBankPhoto) : [],
+            jCommit: this.basicDetail.jCommit ? JSON.parse(this.basicDetail.jCommit) : [],
             jOther: this.basicDetail.jOther ? JSON.parse(this.basicDetail.jOther) : []
         }
         this.expertSign = this.basicDetail.jSign ? JSON.parse(this.basicDetail.jSign) : []

ruoyi-ui/src/views/expert/ewh/index.vue

@@ -277,7 +277,8 @@ export default {
             if (this.exportFujianData.jIdentityPhoto.length < 1 ||
                 this.exportFujianData.jCertificatePhoto.length < 1 ||
                 this.exportFujianData.jScreenshot.length < 1 ||
-                this.exportFujianData.jBankPhoto.length < 1) {
+                this.exportFujianData.jBankPhoto.length < 1 ||
+                this.exportFujianData.jCommit.length < 1) {
                 this.$message({
                     type: 'error',
                     message: '请补充扫描件'
@@ -363,6 +364,7 @@ export default {
                         jCertificatePhoto: data.jCertificatePhoto ? JSON.parse(data.jCertificatePhoto) :[],
                         jScreenshot: data.jScreenshot ? JSON.parse(data.jScreenshot) : [],
                         jBankPhoto: data.jBankPhoto ? JSON.parse(data.jBankPhoto) : [],
+                        jCommit: data.jCommit ? JSON.parse(data.jCommit) : [],
                         jOther: data.jOther ? JSON.parse(data.jOther) : []
                     }
 

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()
   },
 

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`);
 }