Merge remote-tracking branch 'origin/master'

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

@@ -6,6 +6,9 @@
         :to="{ path: '/mine/tenderOffer', query: { aid: aid, uid: uid, sid: sid, qid: form.qid } }">我的报价</el-breadcrumb-item>
       <el-breadcrumb-item>报价</el-breadcrumb-item>
     </el-breadcrumb>
+
+    <el-alert title="注意：需要多次报价的项目，每次报价的总价不能相同！" style="margin: 12px 0" type="error" center></el-alert>
+
     <div class="countdown">
       当前时间：<span class="time">{{ currentTime }}</span>
     </div>
@@ -373,8 +376,9 @@ export default {
         return
       }
 
-      if (this.quoteNumber != this.form.quoteNumber && this.quotePrice > 0 && this.quotePrice < quotePrice) {
-        this.$message.error('报价失败，报价总金额不能高于第一次报价金额')
+      // totalAmount
+      if (this.quoteNumber != this.form.quoteNumber && this.quotePrice > 0 && this.quotePrice <= quotePrice) {
+        this.$message.error('报价失败，报价总金额不能高于或等于第一次报价金额')
         return
       }
       formData.quotePrice = quotePrice;
@@ -385,7 +389,6 @@ export default {
 
       this.loading = true
       submitOffer(formData).then(res => {
-
         this.$message.success('报价成功')
         this.$router.push({ path: '/mine/tenderOffer', query: { aid: this.aid, uid: this.uid, sid: this.sid, qid: this.form.qid } })
       }).finally(() => {

ruoyi-ui/src/views/guarantee/refundable/index.vue

@@ -54,14 +54,6 @@
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-edit"
                         @click="handleBackGuarantee(scope.row)" :loading="backLoading">确认退还保证金</el-button>
-                    <!-- <el-button v-if="checkRole(['centerAdjunct']) && scope.row.isApply == 0"
-                        size="mini" type="text" icon="el-icon-edit"
-                        @click="handleBackApply(scope.row, 1)" :loading="backLoading">申请退还保证金</el-button>
-                    <template v-if="checkRole(['centerFinance'])">
-                        
-                        <el-button v-if="scope.row.isApply == 1" size="mini" type="text"
-                            icon="el-icon-edit" @click="handleBackApply(scope.row, 0)" :loading="backLoading">驳回申请</el-button>
-                    </template> -->
                 </template>
             </el-table-column>
         </el-table>

ruoyi-ui/src/views/purchase/otb/detail.vue

@@ -214,6 +214,7 @@ export default {
   methods: {
     /** 根据计划id查询计划信息 */
     async getPlan () {
+      this.fullscreenLoading = true;
       const res = await getPlan(this.aid)
       const data = res.data;
       this.aAstate = data.aAstate
@@ -254,6 +255,8 @@ export default {
       this.detail.ppmProcurementDetailList = res2.rows
 
       this.totalAmount = res2.rows.reduce((acc, cur) => this.getTotal(acc, cur), 0)
+      
+      this.fullscreenLoading = false
     },
     getRecordApproval () {
       listRecord({ aid: this.aid, flagType: 'ppp' }).then((res) => {