Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/management/roduction/index.vue

@@ -26,13 +26,13 @@
       <el-col :span="1.5" :offset="18" v-if="setrd % 2 == 0">
         <el-button
           type="danger"
-          @click="infoBtn"
+          @click="applyBtn"
           v-hasPermi="['bmProject:project:pass']"
           >审核</el-button
         >
         <el-button
           type="danger"
-          @click="infoBtn"
+          @click="backBtn"
           v-hasPermi="['bmProject:project:reject']"
           >驳回</el-button
         >
@@ -320,10 +320,8 @@ export default {
           this.msgSuccess("提交成功");
         });
     },
-
-    infoBtn(scrop) {
-      if (scrop.projectStatus % 2 == 1) {
-        this.$confirm("是否确认审核", "提醒", {
+    applyBtn(){
+      this.$confirm("是否确认审核", "提醒", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
@@ -338,8 +336,9 @@ export default {
             this.getList();
             this.msgSuccess("审核成功");
           });
-      } else {
-        this.$confirm("是否确认驳回", "提醒", {
+    },
+    backBtn(){
+       this.$confirm("是否确认驳回", "提醒", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
@@ -354,7 +353,6 @@ export default {
             this.getList();
             this.msgSuccess("驳回成功");
           });
-      }
     },
     // 取消按钮
     cancel() {