Merge branch '2025_5_7_bookListApply_pre_cgq' into pre

src/views/news/bookListApply.vue

@@ -81,8 +81,8 @@
             <el-table-column fixed="right" label="操作" width="300" header-align="center">
               <template slot-scope="scope">
                 <div class="listBtnBox">
-                  <div class="listMainBtn" v-if="type_id == 10000" @click="getUpRow(scope.row.id, tableData)"><i
-                      class="el-icon-check"></i>审核
+                  <div class="listMainBtn" v-if="type_id == 10000" @click="getUpRow(scope.row.id, tableData)">
+                    <i class="el-icon-check"></i>审核
                   </div>
 
                   <div class="listDeleteBtn" @click="deleteRow(scope.row.id, tableData)"><i
@@ -204,14 +204,20 @@ export default {
       this.$confirm('将此通过审核吗?', '提示', {
         confirmButtonText: '通过',
         cancelButtonText: '拒绝',
+        distinguishCancelAndClose: true,  // 关键配置项，用于区分取消和关闭按钮的行为
         type: 'warning'
       }).then(() => {
         this.upRow(id, 2)
         this.getData();
-      }).catch(() => {
+      }).catch((the_reback) => {
         //输入驳回理由
-        console.log("驳回")
-        this.examineWindow = true;
+        console.log("val=",the_reback)
+        if (the_reback == "cancel") {
+          //输入驳回理由
+          // console.log("驳回" )
+          this.examineWindow = true;
+        }
+
       })
     },
     upRow(id, status) {

src/views/news/examine.vue

@@ -313,13 +313,19 @@ export default {
       this.$confirm('将此文章通过审核吗?', '提示', {
         confirmButtonText: '通过',
         cancelButtonText: '拒绝',
+        distinguishCancelAndClose: true,  // 关键配置项，用于区分取消和关闭按钮
         type: 'warning'
       }).then(() => {
         this.upRow(id, 1)
-      }).catch(() => {
+      }).catch((the_reback) => {
         //输入驳回理由
-        console.log("驳回")
-        this.examineWindow = true;
+        
+        if (the_reback == "cancel") {
+          //输入驳回理由
+          // console.log("驳回" )
+          this.examineWindow = true;
+        }
+
       })
     },
     //1.5 修改文章状态