zzs 3 сар өмнө
parent
commit
6c875061d9

+ 33 - 34
ruoyi-ui/src/views/expert/tender/components/excelContent.vue

@@ -35,7 +35,7 @@
       </el-descriptions-item>
     </el-descriptions>
 
-    <div v-if="isLeader" class="margin-top">
+    <div class="margin-top">
       <span class="describe">资格审查表</span>
 
       <el-table ref="elTable" max-height="400" :data="zigeList" border style="margin-top: 20px">
@@ -55,7 +55,7 @@
             <div class="pre-text">{{ scope.row.standard }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="" align="center" :width="240">
+        <el-table-column v-if="isLeader" label="" align="center" :width="240">
           <template slot-scope="scope">
             <span v-if="!isEdit">{{ scope.row.isOk }}</span>
             <div v-else>
@@ -67,7 +67,7 @@
       </el-table>
     </div>
 
-    <div v-if="isLeader" class="margin-top">
+    <div class="margin-top">
       <span class="describe">响应性审查表</span>
 
 
@@ -89,7 +89,7 @@
             <div class="pre-text">{{ scope.row.standard }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="得分" align="center" :width="240">
+        <el-table-column v-if="isLeader" label="得分" align="center" :width="240">
           <template slot-scope="scope">
             <span v-if="!isEdit">{{ scope.row.score }}</span>
             <div v-else>
@@ -211,39 +211,38 @@ export default {
 
         this.isLeader = response.data.isLeader === 1;
 
-        if (response.data.isLeader == 1) {
-          const examineList = response.data.examineList || [];
-          const bidExpertExamines = response.data.bidExpertExamines || [];
-          if (bidExpertExamines.length > 0) {
-            for (let examine of examineList) {
-              examine.oid = '';
-              examine.isOk = ''
-              const expertExamine = bidExpertExamines.find(item => item.eid == examine.id)
-              if (expertExamine) {
-                examine.isOk = expertExamine.isOk;
-                examine.oid = expertExamine.id;
-              }
+
+        const examineList = response.data.examineList || [];
+        const bidExpertExamines = response.data.bidExpertExamines || [];
+        if (bidExpertExamines.length > 0) {
+          for (let examine of examineList) {
+            examine.oid = '';
+            examine.isOk = ''
+            const expertExamine = bidExpertExamines.find(item => item.eid == examine.id)
+            if (expertExamine) {
+              examine.isOk = expertExamine.isOk;
+              examine.oid = expertExamine.id;
             }
           }
-          this.zigeList = examineList;
         }
-
-        if (response.data.isLeader == 1) {
-          const xiangyingList = response.data.bidRespondList || [];
-          const bidExpertResponds = response.data.bidExpertResponds || [];
-          if (bidExpertResponds.length > 0) {
-            for (let xiangying of xiangyingList) {
-              xiangying.isOk = '';
-              xiangying.oid = '';
-              const expertRespond = bidExpertResponds.find(item => item.rid == xiangying.id)
-              if (expertRespond) {
-                xiangying.isOk = expertRespond.isOk;
-                xiangying.oid = expertRespond.id;
-              }
+        this.zigeList = examineList;
+
+
+        const xiangyingList = response.data.bidRespondList || [];
+        const bidExpertResponds = response.data.bidExpertResponds || [];
+        if (bidExpertResponds.length > 0) {
+          for (let xiangying of xiangyingList) {
+            xiangying.isOk = '';
+            xiangying.oid = '';
+            const expertRespond = bidExpertResponds.find(item => item.rid == xiangying.id)
+            if (expertRespond) {
+              xiangying.isOk = expertRespond.isOk;
+              xiangying.oid = expertRespond.id;
             }
           }
-          this.xiangyingList = xiangyingList;
         }
+        this.xiangyingList = xiangyingList;
+
 
         const jishuList = response.data.bidTechList || [];
         const bidExpertTeches = response.data.bidExpertTeches || [];
@@ -323,21 +322,21 @@ export default {
     },
     handleDownloadExamine () {
       const workbook = new ExcelJS.Workbook()
-      genExamineExcel(workbook,this.tender.sName,this.excelForm.kaibiaoTime,this.excelForm.kaibiaoAddress,this.hName,this.zigeList)
+      genExamineExcel(workbook, this.tender.sName, this.excelForm.kaibiaoTime, this.excelForm.kaibiaoAddress, this.hName, this.zigeList)
       workbook.xlsx.writeBuffer().then(buffer => {
         saveAs(new Blob([buffer], { type: 'application/octet-stream' }), `资格审查表-${this.hName}.xlsx`)
       })
     },
     handleDownloadRespond () {
       const workbook = new ExcelJS.Workbook()
-      genRespondExcel(workbook,this.tender.sName,this.excelForm.kaibiaoTime,this.excelForm.kaibiaoAddress,this.hName,this.xiangyingList)
+      genRespondExcel(workbook, this.tender.sName, this.excelForm.kaibiaoTime, this.excelForm.kaibiaoAddress, this.hName, this.xiangyingList)
       workbook.xlsx.writeBuffer().then(buffer => {
         saveAs(new Blob([buffer], { type: 'application/octet-stream' }), `响应性审查表-${this.hName}.xlsx`)
       })
     },
     handleDownloadTech () {
       const workbook = new ExcelJS.Workbook()
-      genTechExcel(workbook,this.tender.sName,this.excelForm.kaibiaoTime,this.excelForm.kaibiaoAddress,this.hName,this.jishuList,'技术标')
+      genTechExcel(workbook, this.tender.sName, this.excelForm.kaibiaoTime, this.excelForm.kaibiaoAddress, this.hName, this.jishuList, '技术标')
 
       workbook.xlsx.writeBuffer().then(buffer => {
         saveAs(new Blob([buffer], { type: 'application/octet-stream' }), `技术审查表-${this.hName}.xlsx`)

+ 2 - 3
ruoyi-ui/src/views/expert/tender/detail.vue

@@ -39,12 +39,11 @@
           {{ tender.enrollNumber }}
         </el-descriptions-item>
       </el-descriptions>
-      <el-table v-if="tender.sProjectState > 6 || toubiaoDetail == 'yu' || toubiaoDetail == 'ke'" :data="quoteTableData"
-        border style="width: 100%;margin-top: 20px;">
+      <el-table v-if="tender.sProjectState > 6" :data="quoteTableData" border style="width: 100%;margin-top: 20px;">
         <el-table-column label="供应商名称" prop="hName" align="center" />
         <el-table-column v-if="detail.isEnd" label="报价" prop="quotePrice" align="center" />
         <el-table-column label="报价时间" prop="quoteTime" align="center" />
-        <el-table-column v-if="plan.buyingMode == 2 && toubiaoDetail == 'ke'" label="标书" align="center">
+        <el-table-column label="标书" align="center">
           <template slot-scope="scope">
             <div v-for="(item, index) in scope.row.fjAnnex" :key="index">
               <a :href="item.url" target="_blank" style="color: blue;">{{ item.name }}</a>