Merge branch 'master' of http://gogs.hajianshe.cn/gmcs/HongHu-PSM

# Conflicts:
#	ruoyi-ui/src/views/tender/tender1/components/CompEval.vue

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidCommitteeController.java

@@ -146,6 +146,7 @@ public class BidCommitteeController extends BaseController
         bidCommittee.setUserId(userId);
 
         if(bidCommitteeService.selectBidCommitteeList(bidCommittee).size() == 0){
+            bidCommittee.setStatus(3L);
             bidCommitteeService.insertBidCommittee(bidCommittee);
         }
         for (BsExpert bsExpert : committee.getExpertList()){

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

@@ -36,7 +36,7 @@
     </el-descriptions>
     <div class="margin-top">
       <span class="describe">专家意见</span>
-      <div v-if="!isEdit" class="pre-text">{{ idea }}</div>
+      <div v-if="!isEdit||!isLeader" class="pre-text">{{ idea }}</div>
       <el-input v-else type="textarea" :autosize="{ minRows: 2, maxRows: 6 }" placeholder="请输入专家意见" v-model="idea">
       </el-input>
     </div>
@@ -149,12 +149,12 @@
         <el-button type="primary" @click="handleSave" v-loading.fullscreen.lock="fullscreenLoading">提交分数</el-button>
       </div>
       <div style="margin-top: 10px;">
+        <el-button v-if="isLeader" type="primary" plain @click="handleDownloadIdea">下载专家意见表</el-button>
         <el-button v-if="isLeader && zigeList.length > 0" type="primary" plain
           @click="handleDownloadExamine">下载资格审查表</el-button>
         <el-button v-if="isLeader && xiangyingList.length > 0" type="primary" plain
           @click="handleDownloadRespond">下载响应性审查表</el-button>
         <el-button v-if="jishuList.length > 0" type="primary" plain @click="handleDownloadTech">下载技术审查表</el-button>
-        <el-button v-if="jishuList.length > 0" type="primary" plain @click="handleDownloadIdea">下载专家意见表</el-button>
       </div>
     </div>
   </div>
@@ -295,6 +295,7 @@ export default {
           }
         }
       }
+   
       const bidExpertTeches = this.jishuList.map(item => {
         return {
           id: item.oid,
@@ -306,28 +307,31 @@ export default {
           reason: item.reason,
         }
       })
-
-      const bidExpertExamines = this.zigeList.map(item => {
-        return {
-          id: item.oid,
-          sid: this.tender.sid,
-          eid: item.id,
-          hid: this.hid,
-          hName: this.hName,
-          isOk: item.isOk,
-        }
-      })
-
-      const bidExpertResponds = this.xiangyingList.map(item => {
-        return {
-          id: item.oid,
-          sid: this.tender.sid,
-          rid: item.id,
-          hid: this.hid,
-          hName: this.hName,
-          isOk: item.isOk,
-        }
-      })
+      let bidExpertExamines = []
+      let bidExpertResponds = []
+      if(this.isLeader){
+         bidExpertExamines = this.zigeList.map(item => {
+          return {
+            id: item.oid,
+            sid: this.tender.sid,
+            eid: item.id,
+            hid: this.hid,
+            hName: this.hName,
+            isOk: item.isOk,
+          }
+        })
+
+         bidExpertResponds = this.xiangyingList.map(item => {
+          return {
+            id: item.oid,
+            sid: this.tender.sid,
+            rid: item.id,
+            hid: this.hid,
+            hName: this.hName,
+            isOk: item.isOk,
+          }
+        })
+      }
       const formData = {
         sid: this.tender.sid,
         idea: this.idea,

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

@@ -39,7 +39,7 @@
           {{ tender.enrollNumber }}
         </el-descriptions-item>
       </el-descriptions>
-      <el-table v-if="tender.sProjectState > 6" :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" />

ruoyi-ui/src/views/tender/tender1/components/CompEval.vue

@@ -10,7 +10,7 @@
               :preview-src-list="[sSignSrc]"></el-image>
           </div>
           <file-upload-json v-show="isEdit" @input="handleUploadSSign" :limit="1" :value="SSignFiles" :file-size="10"
-            :file-type="['png', 'jpg', 'pdf']" />
+            :file-type="['png', 'jpg','pdf']" />
         </el-descriptions-item>
         <el-descriptions-item label="审查表">
 
@@ -19,7 +19,7 @@
               :preview-src-list="[sCensorSrc]"></el-image>
           </div>
           <file-upload-json v-show="isEdit" @input="handleUploadSCensor" :limit="1" :value="SCensorFiles"
-            :file-size="10" :file-type="['png', 'jpg', 'pdf']" />
+            :file-size="10" :file-type="['png', 'jpg','pdf']" />
         </el-descriptions-item>
         <el-descriptions-item label="评审表">
 
@@ -28,7 +28,7 @@
               :preview-src-list="[sReviewSrc]"></el-image>
           </div>
           <file-upload-json v-show="isEdit" @input="handleUploadSReview" :limit="1" :value="SReviewFiles"
-            :file-size="10" :file-type="['png', 'jpg', 'pdf']" />
+            :file-size="10" :file-type="['png', 'jpg','pdf']" />
         </el-descriptions-item>
         <el-descriptions-item label="最终汇总表">
           <div v-show="!isEdit">
@@ -36,7 +36,7 @@
               :preview-src-list="[sSummarySrc]"></el-image>
           </div>
           <file-upload-json v-show="isEdit" @input="handleUploadSSummary" :limit="1" :value="SSummaryFiles"
-            :file-size="10" :file-type="['png', 'jpg', 'pdf']" />
+            :file-size="10" :file-type="['png', 'jpg','pdf']" />
         </el-descriptions-item>
       </el-descriptions>
       <div style="margin-top: 20px;text-align: center;">