Merge remote-tracking branch 'origin/master'

bidding-ui/src/views/mine/tenderOffer.vue

@@ -32,8 +32,8 @@
       <el-table-column label="供应商联系方式" prop="contactPhone" align="center" />
       <el-table-column label="报价时间" prop="quoteTime" align="center">
         <template slot-scope="scope">
-            <span>{{scope.row.quoteTime}}</span>
-          </template>
+          {{ scope.row.thirdTime ? scope.row.thirdTime : (scope.row.secondTime ? scope.row.secondTime : scope.row.firstTime) }}
+        </template>
       </el-table-column>
       <el-table-column label="报价金额" align="center">
         <template slot-scope="scope">

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

@@ -41,8 +41,18 @@
       </el-descriptions>
       <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="detail.isEnd" label="报价" prop="quotePrice" align="center">
+          <template slot-scope="scope">
+            <span>
+              {{ scope.row.third ? scope.row.third : (scope.row.second ? scope.row.second : scope.row.first) }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="报价时间" prop="quoteTime" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.thirdTime ? scope.row.thirdTime : (scope.row.secondTime ? scope.row.secondTime : scope.row.firstTime) }}
+          </template>
+        </el-table-column>
         <el-table-column label="标书" align="center">
           <template slot-scope="scope">
             <div v-for="(item, index) in scope.row.fjAnnex" :key="index">
@@ -50,7 +60,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="评分" align="center">
+        <el-table-column v-if="plan.buyingMode == 3" label="评分" align="center">
           <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">评分</el-button>

ruoyi-ui/src/views/tender/tender1/bidding.vue

@@ -67,7 +67,7 @@
         </el-table-column>
         <el-table-column v-if="isOverFirstTime" label="报价时间" prop="quoteTime" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.quoteTime }}</span>
+            {{ scope.row.thirdTime ? scope.row.thirdTime : (scope.row.secondTime ? scope.row.secondTime : scope.row.firstTime) }}
           </template>
         </el-table-column>
         <el-table-column v-if="plan.buyingMode != 1 && checkRole(['operator', 'commander'])" label="标书" align="center">

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

@@ -11,7 +11,7 @@
       </el-table-column>
       <el-table-column prop="quoteTime" align="center" label="报价时间">
         <template slot-scope="scope">
-          <span>{{scope.row.quoteTime}}</span>
+          {{ scope.row.thirdTime ? scope.row.thirdTime : (scope.row.secondTime ? scope.row.secondTime : scope.row.firstTime) }}
         </template>
       </el-table-column>
     </el-table>