Merge branch 'master' of http://219.147.85.210:8080/gmcs/HongHu-PSM

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

@@ -22,7 +22,8 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="银行账号" prop="hAccount">
-            <el-input type="text" v-model.trim="form.hAccount" :disabled="!isEdit" />
+            <el-input type="text" v-model.trim="form.hAccount" 
+              @input="(v) => (form.hAccount = v.replace(/[^\d]/g, ''))" :disabled="!isEdit" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -44,7 +45,6 @@
             </div>
           </el-form-item>
         </el-col>
-
       </el-row>
     </el-form>
 

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

@@ -83,12 +83,12 @@
             </div>
           </template>
         </el-table-column>
-        <!-- <el-table-column v-if="plan.buyingMode != 1 && checkRole(['operator', 'commander'])" align="center" label="操作">
+        <el-table-column v-if="plan.buyingMode == 2 && checkRole(['operator', 'commander'])" align="center" label="操作">
           <template slot-scope="scope">
             <el-button v-if="scope.row.audit != 1" type="text" @click="handlePassAudit(scope.row)">审核通过</el-button>
             <span v-else>已审核通过</span>
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column v-if="isOverFirstTime" align="center" label="报价详情">
           <template slot-scope="scope">
             <el-button type="text" @click="handleShowOfferDetail(scope.row)"