Merge remote-tracking branch 'origin/main'

src/api/stuCQS/process-center/auditDetails.js

@@ -139,3 +139,10 @@ export function delAuditDetails(id) {
     method: 'post'
   })
 }
+//撤销审核
+export function cancelAudit(id) {
+  return request({
+    url: '/comprehensive/auditDetails/cancelAudit/'+id,
+    method: 'post'
+  })
+}

src/views/stuCQS/flowable/processed/index.vue

@@ -32,6 +32,8 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
         <template slot-scope="scope">
+          <!-- <el-button v-if="scope.row.auditStatus == '6'" size="mini" type="text" icon="el-icon-close"
+            @click="processRClick(scope.row)">撤销</el-button> -->
           <el-button size="mini" type="text" icon="el-icon-folder" @click="processVClick(scope.row)">查看详情</el-button>
           <!-- <el-button v-if="scope.row.auditStatus == '6'" size="mini" type="text" icon="el-icon-circle-close"
             @click="cancelVClick(scope.row)">取消加/扣分</el-button> -->
@@ -133,7 +135,7 @@
 </template>
 
 <script>
-import { myProcessed, getAuditDetails, delAuditDetails, addAuditDetails, updateAuditDetails, listOwnProcessed, cancelProcess } from "@/api/stuCQS/process-center/auditDetails";
+import { myProcessed, getAuditDetails, delAuditDetails, addAuditDetails, updateAuditDetails, listOwnProcessed, cancelProcess, cancelAudit } from "@/api/stuCQS/process-center/auditDetails";
 import { isEmpty } from "@/api/helpFunc";
 import lodash from "lodash";
 
@@ -231,6 +233,15 @@ export default {
       this.processForm = val;
       this.processV = true;
     },
+    //撤销
+    async processRClick(row) {
+      const id = row.id;
+      cancelAudit(id).then(res => {
+        if (res.code == 200) {
+          this.getList();
+        }
+      });
+    },
     /** 查询审核明细列表 */
     getList() {
       this.loading = true;
@@ -332,4 +343,3 @@ export default {
   }
 };
 </script>
-