fan0987 3 сар өмнө
parent
commit
88caceb1c8

+ 11 - 6
bidding-ui/src/views/mine/tenderOffer.vue

@@ -37,12 +37,16 @@
       </el-table-column>
       <el-table-column label="报价金额" align="center">
         <template slot-scope="scope">
-          <span>{{scope.row.third ? scope.row.third : (scope.row.second ? scope.row.second : scope.row.first)}}</span>
+          <span v-if="detail.sProjectState != 8">
+            {{scope.row.third ? scope.row.third : (scope.row.second ? scope.row.second : scope.row.first)}}
+          </span>
+          <span v-else>*</span>
         </template>
       </el-table-column>
       <el-table-column align="center" label="报价详情">
         <template slot-scope="scope">
-          <el-button type="text" @click="toShowOfferResult(scope.row)">查看报价详情</el-button>
+          <el-button type="text" @click="toShowOfferResult(scope.row)"
+            :disabled="detail.sProjectState == 8 && scope.row.hid != hid">查看报价详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -111,10 +115,11 @@ export default {
     async getMyOffer () {
       this.loading = true
       try {
-        const query = { sid: this.sid }
-        // if (this.detail.sProjectState != 7) {
-          query.hid = this.hid
-        // }
+        const query = { 
+          sid: this.sid,
+          hid: this.hid
+        }
+        
         const res = await listQuote(query)
 
         this.data = res.data

+ 7 - 5
ruoyi-ui/src/views/tender/tender1/bidding.vue

@@ -59,8 +59,10 @@
         <el-table-column label="供应商联系方式" prop="contactPhone" align="center" />
         <el-table-column v-if="isOverFirstTime" 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>
+            <span v-if="tender.sProjectState != 8">
+              {{ scope.row.third ? scope.row.third : (scope.row.second ? scope.row.second : scope.row.first) }}
+            </span>
+            <span v-else>*</span>
           </template>
         </el-table-column>
         <el-table-column v-if="isOverFirstTime" label="报价时间" prop="quoteTime" align="center">
@@ -83,7 +85,8 @@
         </el-table-column>
         <el-table-column v-if="isOverFirstTime" align="center" label="报价详情">
           <template slot-scope="scope">
-            <el-button type="text" @click="handleShowOfferDetail(scope.row)">查看报价详情</el-button>
+            <el-button type="text" @click="handleShowOfferDetail(scope.row)" 
+              :disabled="tender.sProjectState == 8">查看报价详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -102,8 +105,7 @@
       <el-tabs v-model="activeName4">
         <el-tab-pane v-if="plan.buyingMode != 1 && checkRole(['operator', 'commander'])" label="确定中标人"
           name="determineWin" style="font-size: 16px">
-          <el-button
-            v-if="checkRole(['operator', 'commander']) && tender && tender.sProjectState >= 3 && tender.sProjectState <= 6"
+          <el-button v-if="checkRole(['operator', 'commander']) && tender && tender.sProjectState >= 3 && tender.sProjectState <= 6"
             type="primary" @click="handleAbortiveTender" v-loading.fullscreen.lock="fullscreenLoading">流标</el-button>
           <el-button v-if="checkRole(['operator', 'commander']) && tender && tender.sProjectState == 6" type="primary"
             @click="handleReOpenBid" v-loading.fullscreen.lock="fullscreenLoading">重新开标</el-button>